mirror/osem
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-04-21 15:30:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Integrate the schedule in the admin interface

Browse Source 
Integrate the schedule in the admin interface while adapting it to the new associations and models.
This commit is contained in:
Ana
2016-07-13 01:33:56 +02:00
parent e7a30302ff
commit dfd64a4510
32 changed files with 291 additions and 10074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/application.js
View File

@@ -13,6 +13,7 @@
//= require jquery
//= require jquery_ujs
//= require jquery.mobile.custom.min
//= require jquery-ui.min
//= require waypoints/jquery.waypoints
//= require dataTables/jquery.dataTables
//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap

13
app/assets/javascripts/jquery-ui.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
app/assets/stylesheets/application.css
View File

@@ -14,4 +14,5 @@
*= require bootstrap-datetimepicker
*= require leaflet
*= require bootstrap3-switch
*= require jquery-ui.min
*/

7
app/assets/stylesheets/jquery-ui.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

49
app/assets/stylesheets/osem-schedule.css.scss
View File

@@ -1,3 +1,52 @@
.room-name{
font-weight: bold;
padding:10px;
margin-top: 30px;
border: 1px solid #848484;
background-color: #E6E6E6;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
height: 40px;
line-height: 25px;
overflow: hidden;
}
.schedule-room-slot{
padding: 2px 5px;
border: 1px solid #848484;
height: 58px;
line-height: 20px;
font-size: 13px;
}
.schedule-event{
padding: 7px;
border: 2px solid #151515;
position:relative;
z-index:1;
cursor:move;
}
.schedule-event-text{
display: -webkit-box;
text-overflow: ellipsis;
-webkit-box-orient: vertical;
line-height: 23px;
overflow: hidden;
}
.schedule-event-delete-button {
font-weight:bold;
cursor: pointer;
padding: 0px 3px;
border: 1px solid grey;
margin-right: 5px;
}
#schedule td.event {
background-image: linear-gradient(bottom, rgb(247,250,242) 24%, rgb(194,232,190) 97%, rgb(194,232,190) 100%);
background-image: -o-linear-gradient(bottom, rgb(247,250,242) 24%, rgb(194,232,190) 97%, rgb(194,232,190) 100%);

27
app/controllers/admin/schedules_controller.rb
View File

@@ -7,10 +7,11 @@ module Admin
load_resource :venue, through: :conference, singleton: true
skip_before_filter :verify_authenticity_token, only: [:update]
layout 'schedule'
def show
authorize! :update, @program.events.new
event = @program.events.new
authorize! :update, event
event.destroy
if @conference.nil?
redirect_to admin_conference_index_path
return
@@ -21,6 +22,13 @@ module Admin
else
@rooms = [ Room.new(name: 'No Rooms!', size: 0) ]
end
# if there is not selected schedule we create it
unless @program.selected_schedule.present?
schedule = @program.schedules.create
@program.selected_schedule = schedule.id
@program.save!
end
@schedule_id = @program.selected_schedule
end
def update
@@ -31,14 +39,17 @@ module Admin
error_message = "Could not find event GUID: #{params[:event]}"
end
event_schedule = event.event_schedule(params[:schedule])
if params[:date] == 'none'
event.start_time = nil
event.room = nil
event.save!
event_schedule.destroy if event_schedule.present?
render json: { 'status' => 'ok' }
return
end
event_schedule = event.event_schedules.create(schedule_id: params[:schedule]) unless event_schedule.present?
room = Room.where(guid: room_params).first
if room.nil?
error_message = "Could not find room GUID: #{params[:room]}"
end
@@ -48,7 +59,7 @@ module Admin
return
end
event.room = room
event_schedule.room = room
time = "#{params[:date]} #{params[:time]}"
Rails.logger.debug("Loading #{time}")
@@ -57,8 +68,8 @@ module Admin
# zone = ActiveSupport::TimeZone::new(@conference.timezone)
# start_time = DateTime.strptime(time + zone.formatted_offset, "%Y-%m-%d %k:%M %Z")
start_time = DateTime.strptime(time, '%Y-%m-%d %k:%M')
event.start_time = start_time
event.save!
event_schedule.start_time = start_time
event_schedule.save!
render json: { 'status' => 'ok' }
end

19
app/models/event.rb
View File

@@ -79,11 +79,12 @@ class Event < ActiveRecord::Base
end
##
# Checkes if the event has a start_time and a room for the selected one if there is any.
# Checkes if the event has a start_time and a room for the given schedule
# (given by its id) or for the selected one if there is any.
# ====Returns
# * +true+ or +false+
def unscheduled?
state == 'confirmed' && (!selected_event_schedule.try(:start_time).present? || !selected_event_schedule.try(:room).present?)
def unscheduled?(schedule_id)
state == 'confirmed' && (!event_schedule(schedule_id).try(:start_time).present? || !event_schedule(schedule_id).try(:room).present?)
end
def registration_possible?
@@ -137,11 +138,10 @@ class Event < ActiveRecord::Base
end
end
def as_json(options)
json = super(options)
json[:room_guid] = scheduled_room.try(:guid)
def as_json(options={})
json = super({ include: { event_schedules: { methods: [:room_guid] } } }.merge(options))
json[:track_color] = track.try(:color) || '#FFFFFF'
json[:track_text_color] = ApplicationController.helpers.contrast_color(json[:track_color])
json[:length] = event_type.try(:length) || EventType::LENGTH_STEP
json
@@ -277,6 +277,11 @@ class Event < ActiveRecord::Base
room.events.where(start_time: start_time).where.not(id: id)
end
# returns the event_schedule for this event and the schedule given in case that it exists
def event_schedule(schedule_id)
event_schedules.find_by(schedule_id: schedule_id)
end
private
# returns the event_schedule for this event and for the selected_schedule

4
app/models/event_schedule.rb
View File

@@ -2,4 +2,8 @@ class EventSchedule < ActiveRecord::Base
belongs_to :schedule
belongs_to :event
belongs_to :room
def room_guid
room.try(:guid)
end
end

4
app/models/program.rb
View File

@@ -31,8 +31,8 @@ class Program < ActiveRecord::Base
joins(:event_schedules).where('event_schedules.schedule_id = ? AND event_schedules.start_time IS NOT NULL AND event_schedules.room_id IS NOT NULL', schedule_id)
end
def unscheduled
select(&:unscheduled?)
def unscheduled(schedule_id=nil)
select{ |e| e.unscheduled?(schedule_id) }
end
def highlights

36
app/views/admin/schedules/_day_tab.html.haml
View File

@@ -1,23 +1,13 @@
.schedule-time-column
.schedule-time-column-header
= Time
- (9..18).each do |hour|
.schedule-time-slot
= "#{hour}:00"
.schedule-time-slot
= "#{hour}:15"
.schedule-time-slot
= "#{hour}:30"
.schedule-time-slot
= "#{hour}:45"
- @rooms.each do |room|
.schedule-room-column{:id => "schedule-room-#{room.guid}", "room-guid" => room.guid}
.schedule-room-column-header
= room.name
= "(#{room.size} people)"
- (9..18).each do |hour|
.schedule-room-slot{:id => "schedule-room-#{room.guid}-#{hour}-0", "room-guid" => room.guid, "hour" => "#{hour}:00"}
.schedule-room-slot{:id => "schedule-room-#{room.guid}-#{hour}-15", "room-guid" => room.guid, "hour" => "#{hour}:15"}
.schedule-room-slot{:id => "schedule-room-#{room.guid}-#{hour}-30", "room-guid" => room.guid, "hour" => "#{hour}:30"}
.schedule-room-slot{:id => "schedule-room-#{room.guid}-#{hour}-45", "room-guid" => room.guid, "hour" => "#{hour}:45"}
.row
- @rooms.each do |room|
.col-md-2.col-xs-6
.room-name
= room.name
- (9*4..18*4).each do |slot|
- hour = slot / 4
- time = (15 * (slot % 4) == 0) ? '00' : 15 * (slot % 4)
.schedule-room-slot{ id: "schedule-room-#{room.guid}-#{hour}-#{time}", |
"room-guid" => room.guid, |
hour: "#{hour}:#{time}", |
date: date}
= "#{hour}:#{time}"

208
app/views/admin/schedules/show.html.haml
View File

@@ -1,48 +1,166 @@
.schedule-content
%h2
= "Schedule for #{@conference.title}"
#unscheduled.unscheduled
.unscheduled-header
Unscheduled Events
#schedule.schedule
.schedule-dates-header
%ul#date-tabs
- @dates.each do |date|
%li.date-selector
= link_to "#{date}", "#", id: "#{date}-selector", onclick: "Schedule.changeDay('#{date}')"
.schedule-rooms-container
= render 'day_tab'
.row
.col-md-12
.page-header
%h1 Schedule
%p.text-muted
Create the schedules for the conference
.row
.col-md-2
.h4
Unscheduled events
.unscheduled-events
.col-md-10
%ul.nav.nav-tabs
- @dates.each do |date|
%li{ class: "#{ (@dates.first == date) ? 'active' : '' }"}
%a{ href: "##{date}" }
= date
.tab-content
- @dates.each do |date|
.tab-pane{ class: "#{ (@dates.first == date) ? 'active' : '' }", id: "#{date}" }
= render partial: 'day_tab', locals: { date: date }
:javascript
$(document).ready( function() {
//Schedule.loadDaysAndTracks("#{@conference.short_title}");
var conference = "#{@conference.short_title}"
Schedule.loadEvents("#{@conference.short_title}", "#{@dates.first}");
$('.schedule-room-slot').droppable({
accept: '.schedule-event',
tolerance: "pointer",
drop: function(event, ui) {
$(ui.draggable).appendTo(this);
var myId = $(ui.draggable).attr("guid");
var myRoom = $(this).attr("room-guid")
var myDate = $(this).attr("date");
var myTime = $(this).attr("hour");
var length = $(ui.draggable).attr("length");
$(ui.draggable).css("left", 0);
$(ui.draggable).css("top", 0);
$(this).css("background-color", "#ffffff");
// 15 minute slots on the schedule are 30px,
// thus the magic multiplier here
$(ui.draggable).height(length * 2 - 7);
$(ui.draggable).width($(this).width() - 10);
Schedule.save(conference, myId, myRoom, myDate, myTime);
},
over: function(event, ui) {
$(this).css("background-color", "#009ED8");
},
out: function(event, ui) {
$(this).css("background-color", "#ffffff");
}
});
});
var conference = "#{@conference.short_title}"
var schedule_id = "#{@schedule_id}";
var Schedule = {
loadEvents: function(conference_id, start_date) {
var url = '/admin/conference/' + conference_id + '/program/events';
var callback = function(data) {
$.each(data, function(key, val) {
Schedule.newEvent(val, conference_id);
});
};
$.getJSON(url, callback);
},
newEvent: function(vars, conference_id) {
var height = (vars["length"] / 15 * 58) - 23; // this height fits the room cells
var lines = Math.floor((height - 7) / 23); // subtracting the padding before calculate the number of lines
var newEvent = $('<div class="schedule-event">'
+ '<div class="schedule-event-text" style="-webkit-line-clamp: '+ lines + '; height: ' + (lines * 23) + 'px;">'
+ '<span onclick="Schedule.remove(\'event-' + vars["guid"] + '\', \'' + conference_id +'\');" class="schedule-event-delete-button">X</span>'
+ vars["title"] + '</div></div>');
newEvent.attr("id", "event-" + vars["guid"]);
newEvent.attr("guid", vars["guid"]);
newEvent.css("height", height);
newEvent.css('background-color',vars["track_color"]);
newEvent.css('color',vars["track_text_color"]);
var date = "none";
var room = "none"
var time = "none";
for (i = 0; i < vars["event_schedules"].length; i++) {
event_schedule = vars["event_schedules"][i];
if(event_schedule["schedule_id"] == schedule_id){
room = event_schedule["room_guid"];
var d = new Date(event_schedule["start_time"]);
date = d.getUTCFullYear() + "-"
+ ('0' + (d.getUTCMonth() +1)).slice(-2) + '-'
+ ('0' + d.getUTCDate()).slice(-2);
minutes = d.getUTCMinutes();
time = d.getUTCHours() + ':' + (minutes == 0 ? '00' : minutes);
console.log("date: " + d);
newEvent.attr("room", room);
newEvent.attr("date", date);
newEvent.attr("hour", time);
}
}
newEvent.draggable({
snap: '.schedule-room-slot',
revertDuration: 200,
revert: function (event, ui) {
console.log(event.attr);
return !event;
},
stop: function(event, ui) {
this._originalPosition = this._originalPosition || ui.originalPosition;
ui.helper.animate( this._originalPosition );
},
opacity: 0.7,
snapMode: "inner",
zIndex: 2
});
if (date == "none" || room == "none") {
newEvent.find(".schedule-event-delete-button").hide();
$('.unscheduled-events').append(newEvent);
} else {
var element = "[date='" + date +"'][hour='" + time + "'][room-guid='" + room + "']";
$(element).append(newEvent);
}
},
remove: function(element, conference_id) {
var e = $("#" + element);
var unscheduled = $(".unscheduled-events");
var url = '/admin/conference/' + conference_id + '/schedule';
var params = {
event: e.attr("guid"),
room: "none",
date: "none",
time: "none",
schedule: schedule_id
};
var callback = function(data) {
console.log(data);
e.appendTo(unscheduled);
e.find(".schedule-event-delete-button").hide();
}
$.ajax({
url: url,
type: 'PUT',
data: params,
success: callback,
dataType : 'json'
});
},
save: function (conference_id, event_id, room_id, date, time) {
var url = '/admin/conference/' + conference_id + '/schedule';
var params = {
event: event_id,
room: room_id,
date: date,
time: time,
schedule: schedule_id
};
var callback = function(data) {
console.log(data);
$("#event-" + event_id).find(".schedule-event-delete-button").show();
}
$.ajax({
url: url,
type: 'PUT',
data: params,
success: callback,
dataType : 'json'
});
}
};
Schedule.loadEvents("#{@conference.short_title}", "#{@dates.first}");
$(document).ready( function() {
$('.schedule-room-slot').droppable({
accept: '.schedule-event',
tolerance: "pointer",
drop: function(event, ui) {
$(ui.draggable).appendTo(this);
var myId = $(ui.draggable).attr("guid");
var myRoom = $(this).attr("room-guid")
var myDate = $(this).attr("date");
var myTime = $(this).attr("hour");
$(ui.draggable).css("left", 0);
$(ui.draggable).css("top", 0);
$(this).css("background-color", "#ffffff");
Schedule.save(conference, myId, myRoom, myDate, myTime);
},
over: function(event, ui) {
$(this).css("background-color", "#009ED8");
},
out: function(event, ui) {
$(this).css("background-color", "#ffffff");
}
});
});

2
app/views/layouts/_admin_sidebar.html.haml
View File

@@ -83,7 +83,7 @@
= link_to 'Difficulty Levels', admin_conference_program_difficulty_levels_path(@conference.short_title)
- if can? :update, @conference.program.events.build
%li{class: active_nav_li(admin_conference_schedule_path(@conference.short_title))}
= link_to 'Schedule', admin_conference_schedule_path(@conference.short_title), target: '_blank'
= link_to 'Schedule', admin_conference_schedule_path(@conference.short_title)
- if can? :update, Registration.new(conference_id: @conference.id)
%li{:class=> active_nav_li(admin_conference_registrations_path(@conference.short_title))}

126
public/javascripts/schedule/date.format.js
View File

@@ -1,126 +0,0 @@
/*
* Date Format 1.2.3
* (c) 2007-2009 Steven Levithan <stevenlevithan.com>
* MIT license
*
* Includes enhancements by Scott Trenda <scott.trenda.net>
* and Kris Kowal <cixar.com/~kris.kowal/>
*
* Accepts a date, a mask, or a date and a mask.
* Returns a formatted version of the given date.
* The date defaults to the current date/time.
* The mask defaults to dateFormat.masks.default.
*/
var dateFormat = function () {
var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
timezoneClip = /[^-+\dA-Z]/g,
pad = function (val, len) {
val = String(val);
len = len || 2;
while (val.length < len) val = "0" + val;
return val;
};
// Regexes and supporting functions are cached through closure
return function (date, mask, utc) {
var dF = dateFormat;
// You can't provide utc if you skip other args (use the "UTC:" mask prefix)
if (arguments.length == 1 && Object.prototype.toString.call(date) == "[object String]" && !/\d/.test(date)) {
mask = date;
date = undefined;
}
// Passing date through Date applies Date.parse, if necessary
date = date ? new Date(date) : new Date;
if (isNaN(date)) throw SyntaxError("invalid date");
mask = String(dF.masks[mask] || mask || dF.masks["default"]);
// Allow setting the utc argument via the mask
if (mask.slice(0, 4) == "UTC:") {
mask = mask.slice(4);
utc = true;
}
var _ = utc ? "getUTC" : "get",
d = date[_ + "Date"](),
D = date[_ + "Day"](),
m = date[_ + "Month"](),
y = date[_ + "FullYear"](),
H = date[_ + "Hours"](),
M = date[_ + "Minutes"](),
s = date[_ + "Seconds"](),
L = date[_ + "Milliseconds"](),
o = utc ? 0 : date.getTimezoneOffset(),
flags = {
d: d,
dd: pad(d),
ddd: dF.i18n.dayNames[D],
dddd: dF.i18n.dayNames[D + 7],
m: m + 1,
mm: pad(m + 1),
mmm: dF.i18n.monthNames[m],
mmmm: dF.i18n.monthNames[m + 12],
yy: String(y).slice(2),
yyyy: y,
h: H % 12 || 12,
hh: pad(H % 12 || 12),
H: H,
HH: pad(H),
M: M,
MM: pad(M),
s: s,
ss: pad(s),
l: pad(L, 3),
L: pad(L > 99 ? Math.round(L / 10) : L),
t: H < 12 ? "a" : "p",
tt: H < 12 ? "am" : "pm",
T: H < 12 ? "A" : "P",
TT: H < 12 ? "AM" : "PM",
Z: utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""),
o: (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
S: ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 != 10) * d % 10]
};
return mask.replace(token, function ($0) {
return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
});
};
}();
// Some common format strings
dateFormat.masks = {
"default": "ddd mmm dd yyyy HH:MM:ss",
shortDate: "m/d/yy",
mediumDate: "mmm d, yyyy",
longDate: "mmmm d, yyyy",
fullDate: "dddd, mmmm d, yyyy",
shortTime: "h:MM TT",
mediumTime: "h:MM:ss TT",
longTime: "h:MM:ss TT Z",
isoDate: "yyyy-mm-dd",
isoTime: "HH:MM:ss",
isoDateTime: "yyyy-mm-dd'T'HH:MM:ss",
isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
};
// Internationalization strings
dateFormat.i18n = {
dayNames: [
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
],
monthNames: [
"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
]
};
// For convenience...
Date.prototype.format = function (mask, utc) {
return dateFormat(this, mask, utc);
};

9472
public/javascripts/schedule/jquery-1.8.3.js vendored
View File

File diff suppressed because it is too large Load Diff

6
public/javascripts/schedule/jquery-ui-1.9.2.custom.min.js vendored
View File

File diff suppressed because one or more lines are too long

178
public/javascripts/schedule/schedule.js
View File

@@ -1,178 +0,0 @@
Array.prototype.remove = function() {
var what, a = arguments, L = a.length, ax;
while (L && this.length) {
what = a[--L];
while ((ax = this.indexOf(what)) !== -1) {
this.splice(ax, 1);
}
}
return this;
};
Date.prototype.addDays = function(days) {
var dat = new Date(this.valueOf())
dat.setDate(dat.getDate() + days);
return dat;
}
function getDates(startDate, stopDate) {
var dateArray = new Array();
var currentDate = startDate;
while (currentDate <= stopDate) {
dateArray.push(currentDate)
currentDate = currentDate.addDays(1);
}
return dateArray;
}
var scheduleDayEvents = {};
var Schedule = {
loadEvents: function(conference_id, start_date) {
var eventDates = {};
var url = '/admin/conference/' + conference_id + '/program/events';
var params = { start: $('#start').text(), end: $('#end').text()};
var callback = function(data) {
$.each(data, function(key, val) {
Schedule.newEvent(val, conference_id);
});
Schedule.changeDay(start_date);
};
$.getJSON(url, params, callback);
},
newEvent: function(vars, conference_id) {
var newEvent = $('<div>'
+ '<div onclick="Schedule.remove(\'event-' + vars["guid"] + '\', \'' + conference_id +'\');" class="schedule-event-delete-button">X</div>'
+ '<div>' + vars["title"] + '</div></div>');
var date = "none";
var hour = "12";
var minute = "0";
console.log(vars);
if (vars["start_time"] != null) {
var d = new Date(vars["start_time"]);
date = d.getUTCFullYear() + "-"
+ ('0' + (d.getUTCMonth() +1)).slice(-2) + '-'
+ ('0' + d.getUTCDate()).slice(-2);
hour = d.getUTCHours();
minute = d.getUTCMinutes();
console.log("date: " + d);
}
newEvent.addClass("schedule-event");
newEvent.css('background-color',vars["track_color"]);
newEvent.attr("id", "event-" + vars["guid"]);
newEvent.attr("room", vars["room_guid"]);
newEvent.attr("guid", vars["guid"]);
newEvent.attr("length", vars["length"]);
newEvent.attr("date", date);
newEvent.attr("hour", hour);
newEvent.attr("minute", minute);
newEvent.draggable({
snap: '.schedule-track-slot',
revertDuration: 200,
revert: function (event, ui) {
// $(this).data("draggable").originalPosition = {
// top: 0,
// left: 0
// };
console.log(event.attr);
return !event;
},
stop: function(event, ui) {
this._originalPosition = this._originalPosition || ui.originalPosition;
ui.helper.animate( this._originalPosition );
},
start: function( event, ui ) {
$(ui.helper).height(ui.helper.attr("length") * 2 - 7);
},
opacity: 0.7,
snapMode: "inner",
zIndex: 2
});
if (date == "none" || vars["room_id"] == null) {
$('#unscheduled').append(newEvent);
} else {
if (!scheduleDayEvents.hasOwnProperty(date)) {
scheduleDayEvents[date] = new Array();
}
newEvent.height(newEvent.attr("length") * 2 - 7);
newEvent.width(200 - 10);
scheduleDayEvents[date].push(newEvent);
}
},
remove: function(element, conference_id) {
var e = $("#" + element);
var unscheduled = $("#unscheduled");
var url = '/admin/conference/' + conference_id + '/schedule';
var params = {
event: e.attr("guid"),
room: "none",
date: "none",
time: "none"
};
var callback = function(data) {
console.log(data);
e.height(10);
e.width(unscheduled.width())
e.appendTo(unscheduled);
}
$.ajax({
url: url,
type: 'PUT',
data: params,
success: callback,
dataType : 'json'
});
},
changeDay: function(date) {
$(".date-selector").removeClass("active");
$(".date-selector #" + date + "-selector").parent().addClass("active");
$(".schedule-room-slot").attr("date", date);
// Now clear all of the attached events
$(".schedule-rooms-container .schedule-event").remove();
if (scheduleDayEvents.hasOwnProperty(date)) {
var events = scheduleDayEvents[date];
for (var i = 0; i < events.length; i++) {
var elem = events[i];
elem.draggable({
grid: [200,31],
snap: '.schedule-track-slot',
revert: function (event, ui) {
$(this).data("draggable").originalPosition = {
top: 0,
left: 0
};
return !event;
},
opacity: 0.7,
snapMode: "inner",
zIndex: 2
});
var attachStr = "#schedule-room-" + elem.attr("room") + "-" + elem.attr("hour") + "-" + elem.attr("minute");
$(attachStr).append(elem);
}
}
},
save: function (conference_id, event_id, room_id, date, time) {
var url = '/admin/conference/' + conference_id + '/schedule';
var params = {
event: event_id,
room: room_id,
date: date,
time: time
};
var callback = function(data) {
console.log(data);
}
$.ajax({
url: url,
type: 'PUT',
data: params,
success: callback,
dataType : 'json'
});
},
};

BIN
public/stylesheets/schedule/images/ui-bg_flat_0_aaaaaa_40x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 180 B

BIN
public/stylesheets/schedule/images/ui-bg_flat_75_ffffff_40x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 178 B

BIN
public/stylesheets/schedule/images/ui-bg_glass_55_fbf9ee_1x400.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 120 B

BIN
public/stylesheets/schedule/images/ui-bg_glass_65_ffffff_1x400.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 105 B

BIN
public/stylesheets/schedule/images/ui-bg_glass_75_dadada_1x400.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 111 B

BIN
public/stylesheets/schedule/images/ui-bg_glass_75_e6e6e6_1x400.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 110 B

BIN
public/stylesheets/schedule/images/ui-bg_glass_95_fef1ec_1x400.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 119 B

BIN
public/stylesheets/schedule/images/ui-bg_highlight-soft_75_cccccc_1x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 101 B

BIN
public/stylesheets/schedule/images/ui-icons_222222_256x240.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

BIN
public/stylesheets/schedule/images/ui-icons_2e83ff_256x240.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

BIN
public/stylesheets/schedule/images/ui-icons_454545_256x240.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

BIN
public/stylesheets/schedule/images/ui-icons_888888_256x240.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

BIN
public/stylesheets/schedule/images/ui-icons_cd0a0a_256x240.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

5
public/stylesheets/schedule/jquery-ui-1.9.2.custom.min.css vendored
View File

File diff suppressed because one or more lines are too long

195
public/stylesheets/schedule/schedule.css
View File

@@ -1,195 +0,0 @@
html, body {
height: 100%;
overflow:hidden;
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 14px;
line-height: 20px;
color: #333;
}
.schedule-content {
width:100%;
height:100%;
}
li {
list-style: none;
font-family:Arial, Helvetica, sans-serif;
font-size: 12px;
width: 125px;
display : inline-block;
background: #009ed8;
}
li:hover ul {
display:block;
}
li a {
display: block;
padding: 5px 10px 5px 10px;
text-decoration: none;
border-right: 0px solid black;
width: auto;
color: #fff;
white-space: nowrap;
}
li a:hover {
background: #80dcff;
color: #fff;
}
.active {
background: #1A6907;
color: #fff;
}
li ul {
margin-left: 85px;
margin-top: -25px;
position: absolute;
display: none;
z-index: 99;
display : inline-block;
}
li:hover ul {
visibility: block;
}
li ul li {
float: none;
display: inline;
}
li ul li a {
width: auto;
background: #009ed8;
}
li ul li a:hover {
background: #80dcff;
color: #fff;
}
.schedule-dates-header {
position:absolute;
top:50px;
left: 180px;
right:0px;
}
.unscheduled {
border:1px solid #bbb;
margin-right: 10px;
top:100px;
left:10px;
width:200px;
bottom:50px;
position:absolute;
overflow-x: auto;
overflow-y: auto;
}
.tab-content {
float: left;
width: 100%;
height: 700px;
overflow: auto;
}
.schedule-rooms-container {
position:absolute;
top:100px;
left:220px;
right:0px;
bottom:50px;
overflow: auto;
}
.schedule {
}
.schedule-room-column-header {
float:left;
padding-top:4px;
text-align:center;
width: 200px;
position: relative;
background: #C4E2E2;
}
.unscheduled-header {
text-align:center;
padding-top:4px;
width: 200px;
position: relative;
background: #111953;
color: white;
overflow:hidden;
}
.schedule-time-column-header {
float:left;
padding-top:4px;
width: 200px;
position: relative;
background: #C4E2E2;
}
.schedule-time-column {
border:1px solid #bbb;
float:left;
position:relative;
width:100px;
overflow: hidden;
}
.schedule-room-column {
border:1px solid #bbb;
float:left;
position:relative;
width:200px;
}
.schedule-time-slot {
border-bottom: 1px solid #bbb;
float:left;
position:relative;
width:100px;
height:30px;
}
.schedule-room-slot {
border-bottom: 1px solid #bbb;
float:left;
position:relative;
width:200px;
height:30px;
}
.schedule-event {
overflow:hidden;
text-overflow: ellipsis;
position:relative;
border: 1px solid #000000;
left: 0;
width:200px;
min-height:32px;
background: #6af;
color: #000;
z-index:1;
cursor:move;
}
.schedule-event-delete-button {
position:absolute;
top:3px;
right:4px;
font-weight:bold;
cursor:pointer
}

12
spec/models/event_spec.rb
View File

@@ -260,22 +260,22 @@ describe Event do
end
describe '#as_json' do
it 'adds the event\'s room_guid, track_color and length' do
it 'adds the event\'s track_color, track_text_color and length' do
create(:event_schedule, event: event)
event.track = create(:track, color: '#efefef')
json_hash = event.as_json(nil)
json_hash = event.as_json
expect(json_hash[:room_guid]).to eq(event.scheduled_room.guid)
expect(json_hash[:track_color]).to eq('#EFEFEF')
expect(json_hash[:track_text_color]).to eq('black')
expect(json_hash[:length]).to eq(30)
end
it 'uses correct default values for room_guid, track_color and length' do
it 'uses correct default values for track_color, track_text_color and length' do
event.event_type = nil
json_hash = event.as_json(nil)
json_hash = event.as_json
expect(json_hash[:room_guid]).to be_nil
expect(json_hash[:track_color]).to eq('#FFFFFF')
expect(json_hash[:track_text_color]).to eq('black')
expect(json_hash[:length]).to eq(15)
end
end