diff --git a/css/jquery.jgrowl.min.css b/css/jquery.jgrowl.min.css new file mode 100755 index 00000000..2662a593 --- /dev/null +++ b/css/jquery.jgrowl.min.css @@ -0,0 +1 @@ +.jGrowl{z-index:9999;color:#fff;font-size:12px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;position:fixed}.jGrowl.top-left{left:0;top:0}.jGrowl.top-right{right:0;top:0}.jGrowl.bottom-left{left:0;bottom:0}.jGrowl.bottom-right{right:0;bottom:0}.jGrowl.center{top:0;width:50%;left:25%}.jGrowl.center .jGrowl-closer,.jGrowl.center .jGrowl-notification{margin-left:auto;margin-right:auto}.jGrowl-notification{background-color:#000;opacity:.9;filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100));-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100));zoom:1;width:250px;padding:10px;margin:10px;text-align:left;display:none;border-radius:5px;word-break:break-all;min-height:40px}.jGrowl-notification .ui-state-highlight,.jGrowl-notification .ui-widget-content .ui-state-highlight,.jGrowl-notification .ui-widget-header .ui-state-highlight{border:1px solid #000;background:#000;color:#fff}.jGrowl-notification .jGrowl-header{font-weight:700;font-size:.85em}.jGrowl-notification .jGrowl-close{background-color:transparent;color:inherit;border:none;z-index:99;float:right;font-weight:700;font-size:1em;cursor:pointer}.jGrowl-closer{background-color:#000;opacity:.9;filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100));-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100));zoom:1;width:250px;padding:10px;margin:10px;display:none;border-radius:5px;word-break:break-all;padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:.9em;font-weight:700;text-align:center}.jGrowl-closer .ui-state-highlight,.jGrowl-closer .ui-widget-content .ui-state-highlight,.jGrowl-closer .ui-widget-header .ui-state-highlight{border:1px solid #000;background:#000;color:#fff}@media print{.jGrowl{display:none}} \ No newline at end of file diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php index 0af34098..3d8dc387 100644 --- a/inc/headerAdmin.inc.php +++ b/inc/headerAdmin.inc.php @@ -79,6 +79,7 @@ $modsForHesk_settings = mfh_getSettings(); + @@ -95,6 +96,7 @@ $modsForHesk_settings = mfh_getSettings(); + = " . intval($start) - . " AND `end` <= " . intval($end); + $sql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` WHERE `start` >= FROM_UNIXTIME(" . intval($start) + . " / 1000) AND `end` <= FROM_UNIXTIME(" . intval($end) . " / 1000)"; $rs = hesk_dbQuery($sql); diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js index 5571d716..f2ad0e9f 100644 --- a/js/calendar/mods-for-hesk-calendar.js +++ b/js/calendar/mods-for-hesk-calendar.js @@ -13,6 +13,13 @@ $(document).ready(function() { method: 'GET', dataType: 'json', success: function(data) { + var events = []; + console.log(data); + $(data).each(function() { + events.push(buildEvent(this.id, this)); + }) + callback(events); + //callback w/events here! }, error: function(data) { @@ -85,18 +92,23 @@ $(document).ready(function() { }); function addToCalendar(id, event) { - var eventObject = { + var eventObject = buildEvent(id, event); + $('#calendar').fullCalendar('renderEvent', eventObject); + $.jGrowl("Event successfully created", { theme: 'alert-success', closeTemplate: '' }); +} + +function buildEvent(id, dbObject) { + return { id: id, - title: event.title, - allDay: event.allDay, - start: event.startTime, - end: event.endTime, - comments: event.comments, - createTicketDate: event.createTicketDate, - assignTo: event.assignTo, - location: event.location + title: dbObject.title, + allDay: dbObject.allDay, + start: dbObject.startTime, + end: dbObject.endTime, + comments: dbObject.comments, + createTicketDate: dbObject.createTicketDate, + assignTo: dbObject.assignTo, + location: dbObject.location }; - $('#calendar').fullCalendar('renderEvent', eventObject); } function displayCreateModal(date, viewName) { diff --git a/js/jquery.jgrowl.min.js b/js/jquery.jgrowl.min.js new file mode 100755 index 00000000..28eb6ded --- /dev/null +++ b/js/jquery.jgrowl.min.js @@ -0,0 +1,2 @@ +!function(a){a.jGrowl=function(b,c){0===a("#jGrowl").length&&a('
').addClass(c&&c.position?c.position:a.jGrowl.defaults.position).appendTo(c&&c.appendTo?c.appendTo:a.jGrowl.defaults.appendTo),a("#jGrowl").jGrowl(b,c)},a.fn.jGrowl=function(b,c){if(void 0===c&&a.isPlainObject(b)&&(c=b,b=c.message),a.isFunction(this.each)){var d=arguments;return this.each(function(){void 0===a(this).data("jGrowl.instance")&&(a(this).data("jGrowl.instance",a.extend(new a.fn.jGrowl,{notifications:[],element:null,interval:null})),a(this).data("jGrowl.instance").startup(this)),a.isFunction(a(this).data("jGrowl.instance")[b])?a(this).data("jGrowl.instance")[b].apply(a(this).data("jGrowl.instance"),a.makeArray(d).slice(1)):a(this).data("jGrowl.instance").create(b,c)})}},a.extend(a.fn.jGrowl.prototype,{defaults:{pool:0,header:"",group:"",sticky:!1,position:"top-right",appendTo:"body",glue:"after",theme:"default",themeState:"highlight",corners:"10px",check:250,life:3e3,closeDuration:"normal",openDuration:"normal",easing:"swing",closer:!0,closeTemplate:"×",closerTemplate:"
[ close all ]
",log:function(){},beforeOpen:function(){},afterOpen:function(){},open:function(){},beforeClose:function(){},close:function(){},click:function(){},animateOpen:{opacity:"show"},animateClose:{opacity:"hide"}},notifications:[],element:null,interval:null,create:function(b,c){var d=a.extend({},this.defaults,c);"undefined"!=typeof d.speed&&(d.openDuration=d.speed,d.closeDuration=d.speed),this.notifications.push({message:b,options:d}),d.log.apply(this.element,[this.element,b,d])},render:function(b){var c=this,d=b.message,e=b.options;e.themeState=""===e.themeState?"":"ui-state-"+e.themeState;var f=a("
").addClass("jGrowl-notification alert "+e.themeState+" ui-corner-all"+(void 0!==e.group&&""!==e.group?" "+e.group:"")).append(a("