diff --git a/assets/components/mxcalendars/connector.php b/assets/components/mxcalendars/connector.php
index 77a5b59..31c71cd 100644
--- a/assets/components/mxcalendars/connector.php
+++ b/assets/components/mxcalendars/connector.php
@@ -1,20 +1,30 @@
getOption('mxcalendars.core_path', null, $modx->getOption('core_path') . 'components/mxcalendars/');
+
+$modx->mxcalendars = $modx->getService(
+ 'mxCalendars',
+ 'mxCalendars',
+ $corePath . 'model/mxcalendars/',
+ array(
+ 'core_path' => $corePath
+ )
+);
-require_once dirname(dirname(dirname(dirname(__FILE__)))).'/config.core.php';
-require_once MODX_CORE_PATH.'config/'.MODX_CONFIG_KEY.'.inc.php';
-require_once MODX_CONNECTORS_PATH.'index.php';
-
-$corePath = $modx->getOption('mxcalendars.core_path',null,$modx->getOption('core_path').'components/mxcalendars/');
-require_once $corePath.'model/mxcalendars/mxcalendars.class.php';
-$modx->mxcalendars = new mxCalendars($modx);
-
-$modx->lexicon->load('mxcalendars:default');
-
/* handle request */
-$path = $modx->getOption('processorsPath',$modx->mxcalendars->config,$corePath.'processors/');
-$modx->request->handleRequest(array(
- 'processors_path' => $path,
- 'location' => '',
-));
+$modx->request->handleRequest(
+ array(
+ 'processors_path' => $modx->getOption('processorsPath', null, $corePath . 'processors/'),
+ 'location' => '',
+ )
+);
-?>
+$modx->lexicon->load('mxcalendars:default');
diff --git a/assets/components/mxcalendars/js/mgr/sections/index.js b/assets/components/mxcalendars/js/mgr/sections/home.js
similarity index 50%
rename from assets/components/mxcalendars/js/mgr/sections/index.js
rename to assets/components/mxcalendars/js/mgr/sections/home.js
index c930776..e1c8c3c 100644
--- a/assets/components/mxcalendars/js/mgr/sections/index.js
+++ b/assets/components/mxcalendars/js/mgr/sections/home.js
@@ -1,19 +1,16 @@
Ext.onReady(function() {
MODx.load({ xtype: 'mxcalendars-page-home'});
-
- // Load the datastore for the chunks
- //mxcCore.stores.chunks.load();
});
-
+
mxcCore.page.Home = function(config) {
config = config || {};
Ext.applyIf(config,{
components: [{
- xtype: 'mxcalendars-panel-home'
- ,renderTo: 'mxcalendars-panel-home-div'
+ xtype: 'mxcalendars-panel-home',
+ renderTo: 'mxcalendars-panel-home-div'
}]
});
mxcCore.page.Home.superclass.constructor.call(this,config);
};
-Ext.extend(mxcCore.page.Home,MODx.Component);
-Ext.reg('mxcalendars-page-home',mxcCore.page.Home);
+Ext.extend(mxcCore.page.Home, MODx.Component);
+Ext.reg('mxcalendars-page-home', mxcCore.page.Home);
diff --git a/assets/components/mxcalendars/js/mgr/widgets/home.panel.js b/assets/components/mxcalendars/js/mgr/widgets/home.panel.js
index 741b01d..5f20f04 100644
--- a/assets/components/mxcalendars/js/mgr/widgets/home.panel.js
+++ b/assets/components/mxcalendars/js/mgr/widgets/home.panel.js
@@ -1,67 +1,84 @@
mxcCore.panel.Home = function(config) {
config = config || {};
Ext.apply(config,{
- border: false
- ,baseCls: 'modx-formpanel'
- ,items: [{
- html: ''+_('mxcalendars.management_desc')+'
' + _('mxcalendars.component_title') + ' ',
+ border: false,
+ cls: 'modx-page-header'
+ },
+ {
+ xtype: 'modx-tabs',
+ bodyStyle: 'padding: 10px',
+ defaults: { border: false,autoHeight: true },
+ border: true,
+ items: [
+ {
+ //-- Events Tab
+ title: _('mxcalendars.tab_events'),
+ defaults: { autoHeight: true },
+ items: [
+ // ADD DESCRIPTION INFORMATION
+ {
+ html: '' + _('mxcalendars.management_desc') + '
'+_('mxcalendars.category_desc')+'
'+_('mxcalendars.calendar_desc')+'
'+_('mxcalendars.feed_desc')+'
' + _('mxcalendars.category_desc') + '
' + _('mxcalendars.calendar_desc') + '
' + _('mxcalendars.feed_desc') + '
'+
- '
My HTML content: '+this.menu.record.name+' '+
- '
More fancy things can go here just remember your single quotes.
'+
- '
Sample JSON DATA: '+jsonData.cust_FirstName+' '+jsonData.cust_LastName+'
'+
- '
[ Print Me ]
'
- });
- win.show();
- }
+ },
+ viewCal: function() {
+ //-- this is your this.menu.record.json_post object
+ let json_src = '{"cust_FirstName":"Racovita","cust_LastName":"Victor","cust_PhoneDay":"","cust_Email1":"diavolss@yahoo.com","vInterest":"Pre-Owned","cust_Comments":"Dear Mr\/Ms\\r\\n\\r\\nI would like to ask how can i contact Hyundai engineering department?\\r\\nThank You","submit":"Submit","formConfigId":"contactUs","frm_chainTo":"\/request\/contact"}';
+ let jsonData = Ext.util.JSON.decode(json_src);
+ let win = new Ext.Window({
+ title:'My Title',
+ width: '80%',
+ height: '70%',
+ plain: true,
+ html: '' +
+ '
My HTML content: '+this.menu.record.name+' ' +
+ '
More fancy things can go here just remember your single quotes.
' +
+ '
Sample JSON DATA: '+jsonData.cust_FirstName+' '+jsonData.cust_LastName+'
' +
+ '
[ Print Me ]
'
+ });
+ win.show();
+ }
});
Ext.reg('mxcalendars-grid-calendars',mxcCore.grid.calendars);
@@ -137,23 +158,27 @@ Ext.reg('mxcalendars-grid-calendars',mxcCore.grid.calendars);
mxcCore.window.UpdateCat = function(config) {
config = config || {};
Ext.applyIf(config,{
- title: ''+_('mxcalendars.label_window_create')
- ,url: mxcCore.config.connectorUrl
- ,width: 650
- ,baseParams: {
+ title: ''+_('mxcalendars.label_window_create'),
+ url: mxcCore.config.connectorUrl,
+ width: 650,
+ baseParams: {
action: 'mgr/calendar/update'
- }
- ,fields: [{xtype:'hidden',name:'id'},{
- xtype: 'textfield'
- ,fieldLabel:_('mxcalendars.calendar_name_col_label')
- ,name: 'name'
- },{
- xtype: 'checkbox'
- ,fieldLabel: _('mxcalendars.calendar_name_col_active')
- ,name: 'active'
- ,checked: true
- ,value: 1
- }]
+ },
+ fields: [
+ {
+ xtype:'hidden',name:'id'},{
+ xtype: 'textfield',
+ fieldLabel:_('mxcalendars.calendar_name_col_label'),
+ name: 'name'
+ },
+ {
+ xtype: 'checkbox',
+ fieldLabel: _('mxcalendars.calendar_name_col_active'),
+ name: 'active',
+ checked: true,
+ value: 1
+ }
+ ]
});
mxcCore.window.UpdateCat.superclass.constructor.call(this,config);
};
@@ -167,23 +192,26 @@ Ext.reg('mxcalendars-window-calendar-update',mxcCore.window.UpdateCat);
mxcCore.window.CreateCal = function(config) {
config = config || {};
Ext.applyIf(config,{
- title: ''+_('mxcalendars.label_window_create')
- ,url: mxcCore.config.connectorUrl
- ,width: 650
- ,baseParams: {
+ title: ''+_('mxcalendars.label_window_create'),
+ url: mxcCore.config.connectorUrl,
+ width: 650,
+ baseParams: {
action: 'mgr/calendar/create'
- }
- ,fields: [{
- xtype: 'textfield'
- ,fieldLabel:_('mxcalendars.calendar_name_col_label')
- ,name: 'name'
- },{
- xtype: 'checkbox'
- ,fieldLabel: _('mxcalendars.calendar_name_col_active')
- ,name: 'active'
- ,checked: true
- ,value: 1
- }]
+ },
+ fields: [
+ {
+ xtype: 'textfield',
+ fieldLabel:_('mxcalendars.calendar_name_col_label'),
+ name: 'name'
+ },
+ {
+ xtype: 'checkbox',
+ fieldLabel: _('mxcalendars.calendar_name_col_active'),
+ name: 'active',
+ checked: true,
+ value: 1
+ }
+ ]
});
mxcCore.window.CreateCal.superclass.constructor.call(this,config);
};
diff --git a/assets/components/mxcalendars/js/mgr/widgets/mxcalendars.categories.grid.js b/assets/components/mxcalendars/js/mgr/widgets/mxcalendars.categories.grid.js
index 646267f..4e04c41 100644
--- a/assets/components/mxcalendars/js/mgr/widgets/mxcalendars.categories.grid.js
+++ b/assets/components/mxcalendars/js/mgr/widgets/mxcalendars.categories.grid.js
@@ -1,102 +1,123 @@
mxcCore.grid.categories = function(config) {
config = config || {};
Ext.applyIf(config,{
- id: 'mxcalendars-grid-categories'
- ,url: mxcCore.config.connectorUrl
- ,baseParams: { action: 'mgr/category/getList' }
- ,fields: ['id','isdefault','name','foregroundcss','backgroundcss','inlinecss','disable','active','menu']
- ,paging: true
- ,remoteSort: true
- ,anchor: '97%'
- ,autoExpandColumn: 'name'
- ,save_action: 'mgr/category/updatefromgrid' // Support the inline editing
- ,autosave: true // Support the inline editing
- ,columns: [{
- header: _('id')
- ,dataIndex: 'id'
- ,sortable: true
- },{
- header: _('mxcalendars.category_isdefault_col_label')
- ,dataIndex: 'isdefault'
- ,sortable: true
- ,editor: { xtype: 'modx-combo-boolean', renderer: true}
- },{
- header: _('mxcalendars.category_name_col_label')
- ,dataIndex: 'name'
- ,sortable: true
- ,editor: { xtype: 'textfield' }
- },{
- header: _('mxcalendars.category_foregroundcss_col_label')
- ,dataIndex: 'foregroundcss'
- ,sortable: true
- ,editor: { xtype: 'textfield' }
- },{
- header: _('mxcalendars.category_backgroundcss_col_label')
- ,dataIndex: 'backgroundcss'
- ,sortable: true
- ,editor: { xtype: 'textfield' }
- },{
- header: _('mxcalendars.category_inlinecss_col_label')
- ,dataIndex: 'inlinecss'
- ,sortable: true
- ,editor: { xtype: 'textfield' }
- },{
- header: _('mxcalendars.category_disabled_col_label')
- ,dataIndex: 'disable'
- ,sortable: true
- ,editor: { xtype: 'modx-combo-boolean', renderer: true}
- },{
- header: _('mxcalendars.category_active_col_label')
- ,dataIndex: 'active'
- ,sortable: true
- ,editor: { xtype: 'modx-combo-boolean', renderer: true}
- }],tbar:[{
- xtype: 'textfield'
- ,id: 'mxcalendars-search-categories-filter'
- ,emptyText:_('mxcalendars.default_category_search')
- ,listeners: {
- 'change': {fn:this.search,scope:this}
- ,'render': {fn: function(cmp) {
- new Ext.KeyMap(cmp.getEl(), {
- key: Ext.EventObject.ENTER
- ,fn: function() {
- this.fireEvent('change',this);
- this.blur();
- return true;
- }
- ,scope: cmp
- });
- },scope:this}
- }
- },'->',{
- text:_('mxcalendars.btn_create_cat')
- ,handler: { xtype: 'mxcalendars-window-category-create' ,blankValues: true }
- }]
+ id: 'mxcalendars-grid-categories',
+ url: mxcCore.config.connectorUrl,
+ baseParams: { action: 'mgr/category/getList' },
+ fields: ['id','isdefault','name','foregroundcss','backgroundcss','inlinecss','disable','active','menu'],
+ paging: true,
+ remoteSort: true,
+ anchor: '97%',
+ autoExpandColumn: 'name',
+ save_action: 'mgr/category/updatefromgrid', // Support the inline editing
+ autosave: true, // Support the inline editing
+ columns: [
+ {
+ header: _('id'),
+ dataIndex: 'id',
+ sortable: true
+ },
+ {
+ header: _('mxcalendars.category_isdefault_col_label'),
+ dataIndex: 'isdefault',
+ sortable: true,
+ editor: { xtype: 'modx-combo-boolean', renderer: true}
+ },
+ {
+ header: _('mxcalendars.category_name_col_label'),
+ dataIndex: 'name',
+ sortable: true,
+ editor: { xtype: 'textfield' }
+ },
+ {
+ header: _('mxcalendars.category_foregroundcss_col_label'),
+ dataIndex: 'foregroundcss',
+ sortable: true,
+ editor: { xtype: 'textfield' }
+ },
+ {
+ header: _('mxcalendars.category_backgroundcss_col_label'),
+ dataIndex: 'backgroundcss',
+ sortable: true,
+ editor: { xtype: 'textfield' }
+ },
+ {
+ header: _('mxcalendars.category_inlinecss_col_label'),
+ dataIndex: 'inlinecss',
+ sortable: true,
+ editor: { xtype: 'textfield' }
+ },
+ {
+ header: _('mxcalendars.category_disabled_col_label'),
+ dataIndex: 'disable',
+ sortable: true,
+ editor: { xtype: 'modx-combo-boolean', renderer: true}
+ },
+ {
+ header: _('mxcalendars.category_active_col_label'),
+ dataIndex: 'active',
+ sortable: true,
+ editor: { xtype: 'modx-combo-boolean', renderer: true}
+ }
+ ],
+ tbar:[
+ {
+ xtype: 'textfield',
+ id: 'mxcalendars-search-categories-filter',
+ emptyText:_('mxcalendars.default_category_search'),
+ listeners: {
+ 'change': {fn:this.search,scope:this},
+ 'render': {
+ fn: function(cmp) {
+ new Ext.KeyMap(cmp.getEl(), {
+ key: Ext.EventObject.ENTER,
+ fn: function() {
+ this.fireEvent('change',this);
+ this.blur();
+ return true;
+ },
+ scope: cmp
+ });
+ },
+ scope:this
+ }
+ }
+ },'->',
+ {
+ text:_('mxcalendars.btn_create_cat'),
+ handler: { xtype: 'mxcalendars-window-category-create' ,blankValues: true }
+ }
+ ]
});
- mxcCore.grid.categories.superclass.constructor.call(this,config)
+ mxcCore.grid.categories.superclass.constructor.call(this,config);
};
Ext.extend(mxcCore.grid.categories,MODx.grid.Grid,{
- search: function(tf,nv,ov) {textfield
- var s = this.getStore();
+ search: function(tf,nv,ov) {
+ let s = this.getStore();
s.baseParams.query = tf.getValue();
this.getBottomToolbar().changePage(1);
this.refresh();
- },getMenu: function() {
- var m = [{
- text: _('mxcalendars.menu_update_category')
- ,handler: this.updateCat
- },'-',{
- text: _('mxcalendars.menu_remove_category')
- ,handler: this.removeCat
- }];
+ },
+ getMenu: function() {
+ let m = [
+ {
+ text: _('mxcalendars.menu_update_category'),
+ handler: this.updateCat
+ },'-',
+ {
+ text: _('mxcalendars.menu_remove_category'),
+ handler: this.removeCat
+ }
+ ];
this.addContextMenuItem(m);
return true;
- },updateCat: function(btn,e) {
+ },
+ updateCat: function(btn,e) {
if (!this.updateCatWindow) {
this.updateCatWindow = MODx.load({
- xtype: 'mxcalendars-window-category-update'
- ,record: this.menu.record
- ,listeners: {
+ xtype: 'mxcalendars-window-category-update',
+ record: this.menu.record,
+ listeners: {
'success': {fn:this.refresh,scope:this}
}
});
@@ -104,16 +125,17 @@ Ext.extend(mxcCore.grid.categories,MODx.grid.Grid,{
this.updateCatWindow.setValues(this.menu.record);
}
this.updateCatWindow.show(e.target);
- },removeCat: function() {
+ },
+ removeCat: function() {
MODx.msg.confirm({
- title: _('mxcalendars.cateogry_remove_title')
- ,text: _('mxcalendars.cateogry_remove_confirm')
- ,url: this.config.url
- ,params: {
- action: 'mgr/category/remove'
- ,id: this.menu.record.id
- }
- ,listeners: {
+ title: _('mxcalendars.cateogry_remove_title'),
+ text: _('mxcalendars.cateogry_remove_confirm'),
+ url: this.config.url,
+ params: {
+ action: 'mgr/category/remove',
+ id: this.menu.record.id
+ },
+ listeners: {
'success': {fn:this.refresh,scope:this}
}
});
@@ -128,74 +150,88 @@ Ext.reg('mxcalendars-grid-categories',mxcCore.grid.categories);
mxcCore.window.UpdateCat = function(config) {
config = config || {};
Ext.applyIf(config,{
- title: ''+_('mxcalendars.label_window_create')
- ,url: mxcCore.config.connectorUrl
- ,width: 400
- ,baseParams: {
+ title: ''+_('mxcalendars.label_window_create'),
+ url: mxcCore.config.connectorUrl,
+ width: 400,
+ baseParams: {
action: 'mgr/category/update'
- }
- ,fields: [{xtype:'hidden',name:'id'},{
- xtype: 'textfield'
- ,fieldLabel:_('mxcalendars.category_name_col_label')
- ,name: 'name'
- }/*,{
- xtype: 'combo',
- displayField: 'name',
- valueField: 'id',
- forceSelection: true,
- store: new Ext.data.JsonStore({
- root: 'results',
- idProperty: 'id',
- url: mxcCore.config.connectorUrl,
- baseParams: {
- action: 'stores/getcalendars'
- },
- fields: [
- 'id', 'name'
- ]
- }),
- mode: 'remote',
- triggerAction: 'all',
- fieldLabel: _('mxcalendars.grid_col_calendar'),
- name: 'calendarid',
- hiddenName: 'calendarid',
- id: 'ucalendarid',
- allowBlank: false,
- typeAhead:true,
- minChars:1,
- emptyText:_('mxcalendars.label_select_calendar'),
- valueNotFoundText:_('mxcalendars.label_select_calendar_err'),
- anchor:'100%',
- value: config.record.calendarid
- }*/,{
- xtype: 'checkbox'
- ,fieldLabel: _('mxcalendars.category_isdefault_col_label')
- ,name: 'isdefault'
- },{
- xtype: 'textfield'
- ,fieldLabel: _('mxcalendars.category_foregroundcss_col_label')
- ,name: 'foregroundcss'
- },{
- xtype: 'textfield'
- ,fieldLabel: _('mxcalendars.category_backgroundcss_col_label')
- ,name: 'backgroundcss'
- },{
- xtype: 'textfield'
- ,fieldLabel: _('mxcalendars.category_inlinecss_col_label')
- ,name: 'inlinecss'
- },{
- xtype: 'checkbox'
- ,fieldLabel: _('mxcalendars.category_disabled_col_label')
- ,name: 'disable'
- ,checked: false
- ,value: 1
- },{
- xtype: 'checkbox'
- ,fieldLabel: _('mxcalendars.category_active_col_label')
- ,name: 'active'
- ,checked: true
- ,value: 1
- }]
+ },
+ fields: [
+ {
+ xtype:'hidden',
+ name:'id'
+ },
+ {
+ xtype: 'textfield',
+ fieldLabel:_('mxcalendars.category_name_col_label'),
+ name: 'name'
+ },
+ /*
+ {
+ xtype: 'combo',
+ displayField: 'name',
+ valueField: 'id',
+ forceSelection: true,
+ store: new Ext.data.JsonStore({
+ root: 'results',
+ idProperty: 'id',
+ url: mxcCore.config.connectorUrl,
+ baseParams: {
+ action: 'stores/getcalendars'
+ },
+ fields: [
+ 'id', 'name'
+ ]
+ }),
+ mode: 'remote',
+ triggerAction: 'all',
+ fieldLabel: _('mxcalendars.grid_col_calendar'),
+ name: 'calendarid',
+ hiddenName: 'calendarid',
+ id: 'ucalendarid',
+ allowBlank: false,
+ typeAhead:true,
+ minChars:1,
+ emptyText:_('mxcalendars.label_select_calendar'),
+ valueNotFoundText:_('mxcalendars.label_select_calendar_err'),
+ anchor:'100%',
+ value: config.record.calendarid
+ }*/
+ {
+ xtype: 'checkbox',
+ fieldLabel: _('mxcalendars.category_isdefault_col_label'),
+ name: 'isdefault'
+ },
+ {
+ xtype: 'textfield',
+ fieldLabel: _('mxcalendars.category_foregroundcss_col_label'),
+ name: 'foregroundcss'
+ },
+ {
+ xtype: 'textfield',
+ fieldLabel: _('mxcalendars.category_backgroundcss_col_label'),
+ name: 'backgroundcss'
+ },
+ {
+ xtype: 'textfield',
+ fieldLabel: _('mxcalendars.category_inlinecss_col_label'),
+ name: 'inlinecss'
+ },
+ {
+ xtype: 'checkbox',
+ fieldLabel: _('mxcalendars.category_disabled_col_label'),
+ name: 'disable',
+ checked: false,
+ value: 1
+ },
+ {
+ xtype: 'checkbox',
+ fieldLabel: _('mxcalendars.category_active_col_label'),
+ name: 'active',
+ checked: true,
+ value: 1
+ }
+ ]
});
mxcCore.window.UpdateCat.superclass.constructor.call(this,config);
};
@@ -208,74 +244,84 @@ Ext.reg('mxcalendars-window-category-update',mxcCore.window.UpdateCat);
//-------------------------------------------//
mxcCore.window.CreateCat = function(config) {
config = config || {};
- Ext.applyIf(config,{
- title: ''+_('mxcalendars.label_window_create')
- ,url: mxcCore.config.connectorUrl
- ,width: 400
- ,baseParams: {
+ Ext.applyIf(config,
+ {
+ title: ''+_('mxcalendars.label_window_create'),
+ url: mxcCore.config.connectorUrl,
+ width: 400,
+ baseParams: {
action: 'mgr/category/create'
- }
- ,fields: [{
- xtype: 'textfield'
- ,fieldLabel:_('mxcalendars.category_name_col_label')
- ,name: 'name'
- }/*,{
- xtype: 'combo',
- displayField: 'name',
- valueField: 'id',
- forceSelection: true,
- store: new Ext.data.JsonStore({
- root: 'results',
- idProperty: 'id',
- url: mxcCore.config.connectorUrl,
- baseParams: {
- action: 'stores/getcalendars'
- },
- fields: [
- 'id', 'name'
- ]
- }),
- mode: 'remote',
- triggerAction: 'all',
- fieldLabel: _('mxcalendars.grid_col_calendar'),
- name: 'calendarid',
- hiddenName: 'calendarid',
- id: 'calendarid',
- allowBlank: false,
- typeAhead:true,
- minChars:1,
- emptyText:_('mxcalendars.label_select_calendar'),
- valueNotFoundText:_('mxcalendars.label_select_calendar_err'),
- anchor:'100%'
- }*/,{
- xtype: 'checkbox'
- ,fieldLabel: _('mxcalendars.category_isdefault_col_label')
- ,name: 'isdefault'
- },{
- xtype: 'textfield'
- ,fieldLabel: _('mxcalendars.category_foregroundcss_col_label')
- ,name: 'foregroundcss'
- },{
- xtype: 'textfield'
- ,fieldLabel: _('mxcalendars.category_backgroundcss_col_label')
- ,name: 'backgroundcss'
- },{
- xtype: 'textfield'
- ,fieldLabel: _('mxcalendars.category_inlinecss_col_label')
- ,name: 'inlinecss'
- },{
- xtype: 'checkbox'
- ,fieldLabel: _('mxcalendars.category_disabled_col_label')
- ,name: 'disable'
- ,checked: false
- ,value: 1
- },{
- xtype: 'checkbox'
- ,fieldLabel: _('mxcalendars.category_active_col_label')
- ,name: 'active'
- ,checked: true
- ,value: 1
- }]
+ },
+ fields: [
+ {
+ xtype: 'textfield',
+ fieldLabel:_('mxcalendars.category_name_col_label'),
+ name: 'name'
+ },
+ /*{
+ xtype: 'combo',
+ displayField: 'name',
+ valueField: 'id',
+ forceSelection: true,
+ store: new Ext.data.JsonStore({
+ root: 'results',
+ idProperty: 'id',
+ url: mxcCore.config.connectorUrl,
+ baseParams: {
+ action: 'stores/getcalendars'
+ },
+ fields: [
+ 'id', 'name'
+ ]
+ }),
+ mode: 'remote',
+ triggerAction: 'all',
+ fieldLabel: _('mxcalendars.grid_col_calendar'),
+ name: 'calendarid',
+ hiddenName: 'calendarid',
+ id: 'calendarid',
+ allowBlank: false,
+ typeAhead:true,
+ minChars:1,
+ emptyText:_('mxcalendars.label_select_calendar'),
+ valueNotFoundText:_('mxcalendars.label_select_calendar_err'),
+ anchor:'100%'
+ }*/
+ {
+ xtype: 'checkbox',
+ fieldLabel: _('mxcalendars.category_isdefault_col_label'),
+ name: 'isdefault'
+ },
+ {
+ xtype: 'textfield',
+ fieldLabel: _('mxcalendars.category_foregroundcss_col_label'),
+ name: 'foregroundcss'
+ },
+ {
+ xtype: 'textfield',
+ fieldLabel: _('mxcalendars.category_backgroundcss_col_label'),
+ name: 'backgroundcss'
+ },
+ {
+ xtype: 'textfield',
+ fieldLabel: _('mxcalendars.category_inlinecss_col_label'),
+ name: 'inlinecss'
+ },
+ {
+ xtype: 'checkbox',
+ fieldLabel: _('mxcalendars.category_disabled_col_label'),
+ name: 'disable',
+ checked: false,
+ value: 1
+ },
+ {
+ xtype: 'checkbox',
+ fieldLabel: _('mxcalendars.category_active_col_label'),
+ name: 'active',
+ checked: true,
+ value: 1
+ }
+ ]
});
mxcCore.window.CreateCat.superclass.constructor.call(this,config);
};
diff --git a/assets/components/mxcalendars/js/mgr/widgets/mxcalendars.feed.grid.js b/assets/components/mxcalendars/js/mgr/widgets/mxcalendars.feed.grid.js
index 62c5865..d49fa83 100644
--- a/assets/components/mxcalendars/js/mgr/widgets/mxcalendars.feed.grid.js
+++ b/assets/components/mxcalendars/js/mgr/widgets/mxcalendars.feed.grid.js
@@ -3,109 +3,118 @@ Ext.USE_NATIVE_JSON = false;
mxcCore.grid.feeds = function(config) {
config = config || {};
Ext.applyIf(config,{
- id: 'mxcalendars-grid-feeds'
- ,url: mxcCore.config.connectorUrl
- ,baseParams: { action: 'mgr/feed/getList' }
- ,fields: ['id','feed','type','defaultcategoryid','timerint','timermeasurement',{name:'lastrunon', type: 'date', dateFormat:'timestamp'},{name:'nextrunon', type: 'date', dateFormat:'timestamp'},'active']
- ,paging: true
- ,remoteSort: true
- ,anchor: '97%'
- ,autoExpandColumn: 'name'
- ,save_action: 'mgr/feed/updatefromgrid' // Support the inline editing
- ,autosave: true // Support the inline editing
- ,columns: [{
- header: _('id')
- ,dataIndex: 'id'
- ,sortable: true
- ,width: 5
+ id: 'mxcalendars-grid-feeds',
+ url: mxcCore.config.connectorUrl,
+ baseParams: { action: 'mgr/feed/getList' },
+ fields: ['id','feed','type','defaultcategoryid','timerint','timermeasurement',{name:'lastrunon', type: 'date', dateFormat:'timestamp'},{name:'nextrunon', type: 'date', dateFormat:'timestamp'},'active'],
+ paging: true,
+ remoteSort: true,
+ anchor: '97%',
+ autoExpandColumn: 'name',
+ save_action: 'mgr/feed/updatefromgrid', // Support the inline editing
+ autosave: true, // Support the inline editing
+ columns: [{
+ header: _('id'),
+ dataIndex: 'id',
+ sortable: true,
+ width: 5
},{
- header: _('mxcalendars.feed_col_feed')
- ,dataIndex: 'feed'
- ,sortable: true
- ,editor: { xtype: 'textfield' }
+ header: _('mxcalendars.feed_col_feed'),
+ dataIndex: 'feed',
+ sortable: true,
+ editor: { xtype: 'textfield' }
},{
- header: _('mxcalendars.lastrunon_col_label')
- ,dataIndex: 'lastrunon'
- ,sortable: true
- ,width:40
- , xtype : 'datecolumn'
- ,format:mxcCore.config.mgr_dateformat+' '+mxcCore.config.mgr_timeformat
- , editable:false
- , editor:{xtype:'datefield', format:mxcCore.config.mgr_dateformat+' '+mxcCore.config.mgr_timeformat}
+ header: _('mxcalendars.lastrunon_col_label'),
+ dataIndex: 'lastrunon',
+ sortable: true,
+ width:40,
+ xtype : 'datecolumn',
+ format:mxcCore.config.mgr_dateformat + ' ' + mxcCore.config.mgr_timeformat,
+ editable:false,
+ editor:{xtype:'datefield', format:mxcCore.config.mgr_dateformat + ' ' + mxcCore.config.mgr_timeformat}
},{
- header: _('mxcalendars.nextrunon_col_label')
- ,dataIndex: 'nextrunon'
- ,sortable: true
- ,width:40
- , xtype : 'datecolumn'
- ,format:mxcCore.config.mgr_dateformat+' '+mxcCore.config.mgr_timeformat
- , editable:false
- , editor:{xtype:'datefield', format:mxcCore.config.mgr_dateformat+' '+mxcCore.config.mgr_timeformat}
+ header: _('mxcalendars.nextrunon_col_label'),
+ dataIndex: 'nextrunon',
+ sortable: true,
+ width:40,
+ xtype : 'datecolumn',
+ format:mxcCore.config.mgr_dateformat + ' ' + mxcCore.config.mgr_timeformat,
+ editable:false,
+ editor:{xtype:'datefield', format:mxcCore.config.mgr_dateformat + ' ' + mxcCore.config.mgr_timeformat}
},{
header: _('mxcalendars.feed_col_type'),
dataIndex: 'type',
sortable: true,
width:15,
- editor: { xtype: 'mxc-combo-feedtype', renderer: true, width:120 }}
- ,{
- header: _('mxcalendars.label_default')+' '+_('mxcalendars.categoryid_col_label')
- ,dataIndex: 'defaultcategoryid'
- ,sortable: true
- ,width:20
- ,editor: { xtype: 'mxc-combo-categories', renderer: true }}
- ,{
- header: _('mxcalendars.feed_col_active')
- ,dataIndex: 'active'
- ,sortable: true
- ,editor: { xtype: 'modx-combo-boolean', renderer: true }
- ,width: 15
- }],tbar:[{
- xtype: 'textfield'
- ,id: 'mxcalendars-search-feeds-filter'
- ,emptyText:_('mxcalendars.default_feed_search')
- ,listeners: {
- 'change': {fn:this.search,scope:this}
- ,'render': {fn: function(cmp) {
- new Ext.KeyMap(cmp.getEl(), {
- key: Ext.EventObject.ENTER
- ,fn: function() {
- this.fireEvent('change',this);
- this.blur();
- return true;
- }
- ,scope: cmp
- });
- },scope:this}
+ editor: { xtype: 'mxc-combo-feedtype', renderer: true, width:120 }
+ },{
+ header: _('mxcalendars.label_default') + ' ' + _('mxcalendars.categoryid_col_label'),
+ dataIndex: 'defaultcategoryid',
+ sortable: true,
+ width:20,
+ editor: { xtype: 'mxc-combo-categories', renderer: true }
+ },{
+ header: _('mxcalendars.feed_col_active'),
+ dataIndex: 'active',
+ sortable: true,
+ editor: { xtype: 'modx-combo-boolean', renderer: true },
+ width: 15
+ }],
+ tbar:[{
+ xtype: 'textfield',
+ id: 'mxcalendars-search-feeds-filter',
+ emptyText:_('mxcalendars.default_feed_search'),
+ listeners: {
+ 'change': {fn:this.search,scope:this},
+ 'render': {
+ fn: function(cmp) {
+ new Ext.KeyMap(cmp.getEl(), {
+ key: Ext.EventObject.ENTER,
+ fn: function() {
+ this.fireEvent('change', this);
+ this.blur();
+ return true;
+ },
+ scope: cmp
+ });
+ },
+ scope:this
}
+ }
},'->',{
- text:_('mxcalendars.feed_btn_create')
- ,handler: { xtype: 'mxcalendars-window-feed-create' ,blankValues: true }
+ text:_('mxcalendars.feed_btn_create'),
+ handler: {
+ xtype: 'mxcalendars-window-feed-create',
+ blankValues: true
+ }
}]
});
- mxcCore.grid.feeds.superclass.constructor.call(this,config)
+ mxcCore.grid.feeds.superclass.constructor.call(this,config);
};
Ext.extend(mxcCore.grid.feeds,MODx.grid.Grid,{
- search: function(tf,nv,ov) {textfield
- var s = this.getStore();
+ search: function(tf,nv,ov) {
+ let s = this.getStore();
s.baseParams.query = tf.getValue();
this.getBottomToolbar().changePage(1);
this.refresh();
- },getMenu: function() {
- var m = [{
- text: _('mxcalendars.feed_menu_update')
- ,handler: this.update
+ },
+ getMenu: function() {
+ let m = [{
+ text: _('mxcalendars.feed_menu_update'),
+ handler: this.update
},'-',{
- text: _('mxcalendars.feed_menu_remove')
- ,handler: this.remove
+ text: _('mxcalendars.feed_menu_remove'),
+ handler: this.remove
}];
this.addContextMenuItem(m);
return true;
- },update: function(btn,e) {
+ },
+ update: function(btn,e) {
if (!this.updateWindow) {
this.updateWindow = MODx.load({
- xtype: 'mxcalendars-window-feed-update'
- ,record: this.menu.record
- ,listeners: {
+ xtype: 'mxcalendars-window-feed-update',
+ record: this.menu.record,
+ listeners: {
'success': {fn:this.refresh,scope:this}
}
});
@@ -113,16 +122,17 @@ Ext.extend(mxcCore.grid.feeds,MODx.grid.Grid,{
this.updateWindow.setValues(this.menu.record);
}
this.updateWindow.show(e.target);
- },remove: function() {
+ },
+ remove: function() {
MODx.msg.confirm({
- title: _('mxcalendars.feed_remove_title')
- ,text: _('mxcalendars.feed_remove_confirm')
- ,url: this.config.url
- ,params: {
- action: 'mgr/feed/remove'
- ,id: this.menu.record.id
- }
- ,listeners: {
+ title: _('mxcalendars.feed_remove_title'),
+ text: _('mxcalendars.feed_remove_confirm'),
+ url: this.config.url,
+ params: {
+ action: 'mgr/feed/remove',
+ id: this.menu.record.id
+ },
+ listeners: {
'success': {fn:this.refresh,scope:this}
}
});
@@ -137,71 +147,77 @@ Ext.reg('mxcalendars-grid-feeds',mxcCore.grid.feeds);
mxcCore.window.UpdateFeed = function(config) {
config = config || {};
Ext.applyIf(config,{
- title: _('mxcalendars.feed_menu_update')
- ,url: mxcCore.config.connectorUrl
- ,width: 400
- ,baseParams: {
+ title: _('mxcalendars.feed_menu_update'),
+ url: mxcCore.config.connectorUrl,
+ width: 400,
+ baseParams: {
action: 'mgr/feed/update'
- }
- ,fields: [{xtype:'hidden',name:'id'},{
- xtype: 'textfield'
- ,fieldLabel:_('mxcalendars.feed_col_feed')
- ,name: 'feed'
- },
- {
- xtype: 'mxc-combo-categories',
- fieldLabel: _('mxcalendars.label_default')+' '+_('mxcalendars.categoryid_col_label'),
- name: 'defaultcategoryid',
- allowBlank: false,
- triggerAction: 'all',
- typeAhead: true,
- mode: 'remote',
- width:120,
- listWidth: 120,
- hiddenName: 'defaultcategoryid'
- },
- {
- xtype : 'numberfield',
- fieldLabel : _('mxcalendars.label_feedmeasurementtime'),
- name : 'timerint',
- allowBlank : true,
- emptyText : '0',
- allowDecimals : false,
- minValue : 0,
- maxValue : 3600,
- hiddenName: 'timerint'
},
- {
- xtype: 'mxc-combo-measurementtype',
- fieldLabel: _('mxcalendars.label_feedmeasurementtype'),
- name: 'timermeasurement',
- allowBlank: true,
- triggerAction: 'all',
- typeAhead: true,
- mode: 'remote',
- width:120,
- listWidth: 120,
- hiddenName: 'timermeasurement'
- },
- {
- xtype: 'mxc-combo-feedtype',
- fieldLabel: _('mxcalendars.feed_col_type'),
- name: 'type',
- allowBlank: false,
- triggerAction: 'all',
- typeAhead: true,
- mode: 'local',
- width:120,
- listWidth: 120,
- hiddenName: 'type'
- }
- ,{
- xtype: 'checkbox'
- ,fieldLabel: _('mxcalendars.feed_col_active')
- ,name: 'active'
- ,checked: true
- ,value: 1
- }]
+ fields: [
+ {
+ xtype:'hidden',
+ name:'id'
+ },
+ {
+ xtype: 'textfield',
+ fieldLabel:_('mxcalendars.feed_col_feed'),
+ name: 'feed'
+ },
+ {
+ xtype: 'mxc-combo-categories',
+ fieldLabel: _('mxcalendars.label_default') + ' ' + _('mxcalendars.categoryid_col_label'),
+ name: 'defaultcategoryid',
+ allowBlank: true,
+ triggerAction: 'all',
+ typeAhead: true,
+ mode: 'remote',
+ width:120,
+ listWidth: 120,
+ hiddenName: 'defaultcategoryid'
+ },
+ {
+ xtype: 'numberfield',
+ fieldLabel: _('mxcalendars.label_feedmeasurementtime'),
+ name: 'timerint',
+ allowBlank: true,
+ emptyText: '0',
+ allowDecimals: false,
+ minValue: 0,
+ maxValue: 3600,
+ hiddenName: 'timerint'
+ },
+ {
+ xtype: 'mxc-combo-measurementtype',
+ fieldLabel: _('mxcalendars.label_feedmeasurementtype'),
+ name: 'timermeasurement',
+ allowBlank: true,
+ triggerAction: 'all',
+ typeAhead: true,
+ mode: 'remote',
+ width:120,
+ listWidth: 120,
+ hiddenName: 'timermeasurement'
+ },
+ {
+ xtype: 'mxc-combo-feedtype',
+ fieldLabel: _('mxcalendars.feed_col_type'),
+ name: 'type',
+ allowBlank: true,
+ triggerAction: 'all',
+ typeAhead: true,
+ mode: 'local',
+ width:120,
+ listWidth: 120,
+ hiddenName: 'type'
+ },
+ {
+ xtype: 'checkbox',
+ fieldLabel: _('mxcalendars.feed_col_active'),
+ name: 'active',
+ checked: true,
+ value: 1
+ }
+ ]
});
mxcCore.window.UpdateFeed.superclass.constructor.call(this,config);
};
@@ -215,22 +231,22 @@ Ext.reg('mxcalendars-window-feed-update',mxcCore.window.UpdateFeed);
mxcCore.window.CreateFeed = function(config) {
config = config || {};
Ext.applyIf(config,{
- title: _('mxcalendars.feed_btn_create')
- ,url: mxcCore.config.connectorUrl
- ,width: 400
- ,baseParams: {
+ title: _('mxcalendars.feed_btn_create'),
+ url: mxcCore.config.connectorUrl,
+ width: 400,
+ baseParams: {
action: 'mgr/feed/create'
- }
- ,fields: [{
- xtype: 'textfield'
- ,fieldLabel:_('mxcalendars.feed_col_feed')
- ,name: 'feed'
+ },
+ fields: [{
+ xtype: 'textfield',
+ fieldLabel:_('mxcalendars.feed_col_feed'),
+ name: 'feed'
},
{
xtype: 'mxc-combo-categories',
fieldLabel: _('mxcalendars.label_default')+' '+_('mxcalendars.categoryid_col_label'),
name: 'defaultcategoryid',
- allowBlank: false,
+ allowBlank: true,
triggerAction: 'all',
typeAhead: true,
mode: 'remote',
@@ -265,7 +281,7 @@ mxcCore.window.CreateFeed = function(config) {
xtype: 'mxc-combo-feedtype',
fieldLabel: _('mxcalendars.feed_col_type'),
name: 'type',
- allowBlank: false,
+ allowBlank: true,
editable: false,
triggerAction: 'all',
typeAhead: true,
@@ -274,13 +290,13 @@ mxcCore.window.CreateFeed = function(config) {
listWidth: 120,
hiddenName: 'type',
- }
- ,{
- xtype: 'checkbox'
- ,fieldLabel: _('mxcalendars.feed_col_active')
- ,name: 'active'
- ,checked: true
- ,value: 1
+ },
+ {
+ xtype: 'checkbox',
+ fieldLabel: _('mxcalendars.feed_col_active'),
+ name: 'active',
+ checked: true,
+ value: 1
}]
});
mxcCore.window.CreateFeed.superclass.constructor.call(this,config);
diff --git a/assets/components/mxcalendars/js/mgr/widgets/mxcalendars.grid.js b/assets/components/mxcalendars/js/mgr/widgets/mxcalendars.grid.js
index 6f7ae8c..d3cb125 100644
--- a/assets/components/mxcalendars/js/mgr/widgets/mxcalendars.grid.js
+++ b/assets/components/mxcalendars/js/mgr/widgets/mxcalendars.grid.js
@@ -1,1523 +1,2006 @@
-mxcCore.grid.events = function(config) {
+mxcCore.grid.events = function (config) {
config = config || {};
- Ext.applyIf(config,{
- id: 'mxcalendars-grid-events'
- ,url: mxcCore.config.connectorUrl
- ,baseParams: {action: 'mgr/events/getList'}
- ,fields: ['id','description','content','title','context','calendar_id','form_chunk','categoryid','source','feeds_id','feeds_uid',{name:'startdate', type: 'date', dateFormat:'timestamp'},'startdate_date','startdate_time',{name:'enddate', type: 'date', dateFormat:'timestamp'},'enddate_date','enddate_time','repeating','repeattype','repeaton','repeatfrequency',{name:'repeatenddate', type: 'date', dateFormat:'timestamp'},'repeatdates','menu','name','map','link','linkrel','linktarget','location_name','location_address','address','active','catfriendly','allday']
- ,paging: true
- ,remoteSort: true
- ,anchor: '97%'
- ,autoExpandColumn: 'name'
- ,save_action: 'mgr/events/updatefromgrid' // Support the inline editing
- ,autosave: true // Support the inline editing
- ,columns: [
- // add the grid columns to the display
- {header: _('id'),dataIndex: 'id',sortable: true,width:40}
- ,{header: _('mxcalendars.source'),dataIndex: 'source',sortable: true,width:50}
- ,{header: _('mxcalendars.name'),dataIndex: 'title',sortable: true,width:110,editor: {xtype: 'textfield'}}
- ,{header: _('mxcalendars.grid_col_context'), dataIndex:'context',editor: { xtype: 'mxc-combo-context', renderer: true }}
- ,{header: _('mxcalendars.grid_col_calendar'), dataIndex:'calendar_id',editor: { xtype: 'mxc-combo-calendar', renderer: true }}
- ,{header: _('mxcalendars.categoryid_col_label'),dataIndex: 'catfriendly',sortable: true,width:80}
- //,{header: _('mxcalendars.startdate_col_label'),dataIndex: 'startdate',sortable: true}
- ,{header: _('mxcalendars.startdate_col_label'),dataIndex: 'startdate',sortable: true,width:60, xtype : 'datecolumn',format:mxcCore.config.mgr_dateformat, editable:false, editor:{xtype:'datefield', format:mxcCore.config.mgr_dateformat}}
- ,{header: _('mxcalendars.starttime_col_label'), dataIndex: 'startdate_time', sortable:false,width:60, editor:{ xtype:'timefield', format: mxcCore.config.mgr_timeformat}}
- ,{header: _('mxcalendars.enddate_col_label'),dataIndex: 'enddate',sortable: true,width:60, xtype : 'datecolumn',format:mxcCore.config.mgr_dateformat, editable:false, editor:{xtype:'datefield',format:mxcCore.config.mgr_dateformat}}
- ,{header: _('mxcalendars.endtime_col_label'),dataIndex: 'enddate_time',sortable: false,width:60, editor:{ xtype:'timefield', format: mxcCore.config.mgr_timeformat}}
- ,{header: _('mxcalendars.repeating_col_label'),dataIndex: 'repeating',sortable: true,width:30}
- ,{header: _('mxcalendars.repeating_last_occ_col_label'),dataIndex: 'repeatenddate', sortable: true,width:60, xtype : 'datecolumn',format:mxcCore.config.mgr_dateformat}
- ,{header: _('mxcalendars.category_active_col_label'),dataIndex: 'active', sortable: true,width:30,editor: { xtype: 'modx-combo-boolean', renderer: true}}
- ,{hidden:true, header: _('mxcalendars.label_content'), dataIndex:'content'}
- ,{hidden:true, header: _('mxcalendars.label_forms'), dataIndex:'form_chunk'}
- ,{hidden:true, header: _('mxcalendars.label_repeating_event'), dataIndex:'repeating'}
- ,{hidden:true, header: _('mxcalendars.label_repeat_type'), dataIndex:'repeattype'}
- ,{hidden:true, header: _('mxcalendars.label_repeaton'), dataIndex:'repeaton'}
- ,{hidden:true, header: _('mxcalendars.label_repeat_frequency'), dataIndex:'repeatfrequency'}
- ,{hidden:true, header: _('mxcalendars.label_display_map'), dataIndex:'map'}
- ,{hidden:true, header: _('mxcalendars.label_link'), dataIndex:'link'}
- ,{hidden:true, header: _('mxcalendars.label_link_rel'), dataIndex:'linkrel'}
- ,{hidden:true, header: _('mxcalendars.label_link_target'), dataIndex:'linktarget'}
- ,{hidden:true, header: _('mxcalendars.label_location')+' '+_('mxcalendars.label_name'), dataIndex:'location_name'}
- ,{hidden:true, header: _('mxcalendars.label_address'), dataIndex:'location_address'}
- ,{hidden:true, header: _('mxcalendars.label_location')+' '+_('mxcalendars.label_address'), dataIndex:'address'}
- ,{hidden:true, header: _('mxcalendars.label_allday'), dataIndex:'allday',editable:false,editor: { xtype: 'modx-combo-boolean', renderer: true}}
- ],tbar:[{
- xtype: 'textfield'
- ,id: 'mxcalendars-search-filter'
- ,emptyText:_('mxcalendars.search_default_text')
- ,listeners: {
- 'change': {fn:this.search,scope:this}
- ,'render': {fn: function(cmp) {
- new Ext.KeyMap(cmp.getEl(), {
- key: Ext.EventObject.ENTER
- ,fn: function() {
- this.fireEvent('change',this);
- this.blur();
- return true;
- }
- ,scope: cmp
- });
- },scope:this}
- }
- },'->',{
- text:_('mxcalendars.btn_show_past_events')
- ,id:'pastbnt'
- ,visible:true
- ,handler: function(){
- var s = this.getStore();
- s.baseParams.historical = 1;
- this.getBottomToolbar().changePage(1);
- this.refresh();
- Ext.getCmp('pastbnt').hide();
- Ext.getCmp('futurebnt').show();
+ Ext.applyIf(config, {
+ id: 'mxcalendars-grid-events',
+ url: mxcCore.config.connectorUrl,
+ baseParams: {action: 'mgr/events/getList'},
+ fields: [
+ 'id',
+ 'description',
+ 'content',
+ 'title',
+ 'context',
+ 'calendar_id',
+ 'form_chunk',
+ 'categoryid',
+ 'source',
+ 'feeds_id',
+ 'feeds_uid',
+ {
+ name: 'startdate',
+ type: 'date',
+ dateFormat: 'timestamp'
+ },
+ 'startdate_date',
+ 'startdate_time',
+ {
+ name: 'enddate',
+ type: 'date',
+ dateFormat: 'timestamp'
+ },
+ 'enddate_date',
+ 'enddate_time',
+ 'repeating',
+ 'repeattype',
+ 'repeaton',
+ 'repeatfrequency',
+ {
+ name: 'repeatenddate',
+ type: 'date',
+ dateFormat: 'timestamp'
+ },
+ 'repeatdates',
+ 'menu', 'name',
+ 'map',
+ 'link',
+ //'linkrel',
+ 'linktarget',
+ 'location_name',
+ 'location_address',
+ 'address',
+ 'price',
+ 'food',
+ 'age',
+ 'capacity',
+ 'active',
+ 'catfriendly',
+ 'allday'
+ ],
+ paging: true,
+ remoteSort: true,
+ anchor: '97%',
+ autoExpandColumn: 'name',
+ save_action: 'mgr/events/updatefromgrid', // Support the inline editing
+ autosave: true, // Support the inline editing
+ columns: [
+ // add the grid columns to the display
+ {
+ header: _('id'),
+ dataIndex: 'id',
+ sortable: true,
+ width: 40
+ },
+ {
+ header: _('mxcalendars.source'),
+ dataIndex: 'source',
+ sortable: true,
+ width: 50
+ },
+ {
+ header: _('mxcalendars.name'),
+ dataIndex: 'title',
+ sortable: true,
+ width: 110,
+ msgTarget:'under',
+ editor: {xtype: 'textfield'}
+ },
+ {
+ header: _('mxcalendars.grid_col_context'),
+ dataIndex: 'context',
+ editor: {xtype: 'mxc-combo-context', renderer: true}
+ },
+ {
+ header: _('mxcalendars.grid_col_calendar'),
+ dataIndex: 'calendar_id',
+ editor: {xtype: 'mxc-combo-calendar', renderer: true}
+ },
+ {
+ header: _('mxcalendars.categoryid_col_label'),
+ dataIndex: 'catfriendly',
+ sortable: true,
+ width: 80
+ },
+ // {
+ // header: _('mxcalendars.startdate_col_label'),
+ // dataIndex: 'startdate',
+ // sortable: true
+ // },
+ {
+ header: _('mxcalendars.startdate_col_label'),
+ dataIndex: 'startdate',
+ sortable: true,
+ width: 60,
+ xtype: 'datecolumn',
+ format: mxcCore.config.mgr_dateformat,
+ editable: true,
+ editor: {xtype: 'datefield', format: mxcCore.config.mgr_dateformat}
+ },
+ {
+ header: _('mxcalendars.starttime_col_label'),
+ dataIndex: 'startdate_time',
+ sortable: false,
+ width: 60,
+ editable: true,
+ editor: {xtype: 'timefield', format: mxcCore.config.mgr_timeformat}
+ },
+ {
+ header: _('mxcalendars.enddate_col_label'),
+ dataIndex: 'enddate',
+ sortable: true,
+ width: 60,
+ xtype: 'datecolumn',
+ format: mxcCore.config.mgr_dateformat,
+ editable: true,
+ editor: {xtype: 'datefield', format: mxcCore.config.mgr_dateformat}
+ },
+ {
+ header: _('mxcalendars.endtime_col_label'),
+ dataIndex: 'enddate_time',
+ sortable: false,
+ width: 60,
+ editable: true,
+ editor: {xtype: 'timefield', format: mxcCore.config.mgr_timeformat}
+ },
+ {
+ header: _('mxcalendars.repeating_col_label'), dataIndex: 'repeating', sortable: true, width: 30
+ },
+ {
+ header: _('mxcalendars.repeating_last_occ_col_label'),
+ dataIndex: 'repeatenddate',
+ sortable: true,
+ width: 60,
+ xtype: 'datecolumn',
+ format: mxcCore.config.mgr_dateformat,
+ editable: true,
+ editor: {xtype: 'datefield', format: mxcCore.config.mgr_dateformat}
+ },
+ {
+ header: _('mxcalendars.category_active_col_label'),
+ dataIndex: 'active',
+ sortable: true,
+ width: 30,
+ editor: {xtype: 'modx-combo-boolean', renderer: true}
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_content'),
+ dataIndex: 'content'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_forms'),
+ dataIndex: 'form_chunk'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_repeating_event'),
+ dataIndex: 'repeating'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_repeat_type'),
+ dataIndex: 'repeattype'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_repeaton'),
+ dataIndex: 'repeaton'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_repeat_frequency'),
+ dataIndex: 'repeatfrequency'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_display_map'),
+ dataIndex: 'map'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_link'),
+ dataIndex: 'link'
+ },
+ // {
+ // hidden: true,
+ // header: _('mxcalendars.label_link_rel'),
+ // dataIndex: 'linkrel'
+ // },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_link_target'),
+ dataIndex: 'linktarget'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_location') + ' ' + _('mxcalendars.label_name'),
+ dataIndex: 'location_name'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_address'),
+ dataIndex: 'location_address'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_location') + ' ' + _('mxcalendars.label_address'),
+ dataIndex: 'address'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_price') + ' ' + _('mxcalendars.label_price'),
+ dataIndex: 'price'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_food') + ' ' + _('mxcalendars.label_food'),
+ dataIndex: 'food'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_age') + ' ' + _('mxcalendars.label_age'),
+ dataIndex: 'age'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_capacity') + ' ' + _('mxcalendars.label_capacity'),
+ dataIndex: 'capacity'
+ },
+ {
+ hidden: true,
+ header: _('mxcalendars.label_allday'),
+ dataIndex: 'allday',
+ editable: false,
+ editor: {xtype: 'modx-combo-boolean', renderer: true}
+ }
+ ],
+ tbar: [
+ {
+ xtype: 'textfield',
+ id: 'mxcalendars-search-filter',
+ emptyText: _('mxcalendars.search_default_text'),
+ listeners: {
+ 'change': {fn: this.search, scope: this},
+ 'render': {
+ fn: function (cmp) {
+ new Ext.KeyMap(cmp.getEl(), {
+ key: Ext.EventObject.ENTER,
+ fn: function () {
+ this.fireEvent('change', this);
+ this.blur();
+ return true;
+ }, scope: cmp
+ });
+ }, scope: this
}
- },{
- text:_('mxcalendars.btn_show_upcoming_events')
- ,id:'futurebnt'
- ,hidden:true
- ,handler: function(){
- var s = this.getStore();
- s.baseParams.historical = 0;
- this.getBottomToolbar().changePage(1);
- this.refresh();
- Ext.getCmp('futurebnt').hide();
- Ext.getCmp('pastbnt').show();
- }
- },'-',{
- text:_('mxcalendars.btn_create')
- ,handler:this.createCal
- }]
+ }
+ }, '->', {
+ text: _('mxcalendars.btn_show_past_events'),
+ id: 'pastbnt',
+ visible: true,
+ handler: function () {
+ let s = this.getStore();
+ s.baseParams.historical = 1;
+ this.getBottomToolbar().changePage(1);
+ this.refresh();
+ Ext.getCmp('pastbnt').hide();
+ Ext.getCmp('futurebnt').show();
+ }
+ },
+ {
+ text: _('mxcalendars.btn_show_upcoming_events'),
+ id: 'futurebnt',
+ hidden: true,
+ handler: function () {
+ let s = this.getStore();
+ s.baseParams.historical = 0;
+ this.getBottomToolbar().changePage(1);
+ this.refresh();
+ Ext.getCmp('futurebnt').hide();
+ Ext.getCmp('pastbnt').show();
+ }
+ }, '-', {
+ text: _('mxcalendars.btn_create'),
+ handler: this.createCal
+ }
+ ]
});
- mxcCore.grid.events.superclass.constructor.call(this,config)
+ mxcCore.grid.events.superclass.constructor.call(this, config);
};
-Ext.extend(mxcCore.grid.events,MODx.grid.Grid,{
- search: function(tf,nv,ov) {
- var s = this.getStore();
+Ext.extend(mxcCore.grid.events, MODx.grid.Grid, {
+ search: function (tf, nv, ov) {
+ let s = this.getStore();
s.baseParams.query = tf.getValue();
this.getBottomToolbar().changePage(1);
this.refresh();
- },getMenu: function() {
- var m = [{
- text: _('mxcalendars.event_title_update')
- ,handler: this.updateCal
- },'-',{
- text: _('mxcalendars.event_title_duplicate')
- ,handler: this.duplicateEvent
- },'-',{
- text: _('mxcalendars.event_title_remove')
- ,handler: this.removeCal
- }];
- this.addContextMenuItem(m);
- return true;
- },createCal: function(btn,e) {
- mxcCore.eventId = 0;
- if (this.createCalWindow) {
- this.createCalWindow.close();
- }
- this.createCalWindow = MODx.load({
- xtype: 'mxcalendars-window-mxcalendar-create'
- ,record: {'repeaton':''}
- });
-
- this.createCalWindow.show(e.target);
- //this.createCalWindow.center();
- },updateCal: function(btn,e) {
- mxcCore.eventId = this.menu.record.id;
- if (this.updateCalWindow) {
- this.updateCalWindow.close();
- }
- this.updateCalWindow = MODx.load({
- xtype: 'mxcalendars-window-mxcalendar-update'
- ,record: this.menu.record
- ,listeners: {
- 'success': {fn:this.refresh,scope:this}
- }
- });
-
- this.updateCalWindow.show(e.target);
- //this.updateCalWindow.center();
- },removeCal: function() {
- MODx.msg.confirm({
- title: _('mxcalendars.mxcalendars_remove')
- ,text: _('mxcalendars.mxcalendars_remove_confirm')
- ,url: this.config.url
- ,params: {
- action: 'mgr/events/remove'
- ,id: this.menu.record.id
- }
- ,listeners: {
- 'success': {fn:this.refresh,scope:this}
- }
- });
- },duplicateEvent:function(btn,e){
- if (this.createCalWindow) {
- this.createCalWindow.close();
- }
- cloneRec = this.menu.record;
- cloneRec.title = '('+_('mxcalendars.label_duplicate')+') '+cloneRec.title;
- this.createCalWindow = MODx.load({
- xtype: 'mxcalendars-window-mxcalendar-create'
- ,record: cloneRec
- });
- this.createCalWindow.show(e.target);
+ },
+ getMenu: function () {
+ let m = [
+ {
+ text: _('mxcalendars.event_title_update'),
+ handler: this.updateCal
+ }, '-', {
+ text: _('mxcalendars.event_title_duplicate'),
+ handler: this.duplicateEvent
+ }, '-', {
+ text: _('mxcalendars.event_title_remove'),
+ handler: this.removeCal
+ }
+ ];
+ this.addContextMenuItem(m);
+ return true;
+ },
+ createCal: function (btn, e) {
+ mxcCore.eventId = 0;
+ if (this.createCalWindow) {
+ this.createCalWindow.close();
+ }
+ this.createCalWindow = MODx.load({
+ xtype: 'mxcalendars-window-mxcalendar-create',
+ record: {'repeaton': ''}
+ });
+
+ this.createCalWindow.show(e.target);
+ //this.createCalWindow.center();
+ },
+ updateCal: function (btn, e) {
+ mxcCore.eventId = this.menu.record.id;
+ if (this.updateCalWindow) {
+ this.updateCalWindow.close();
}
+ this.updateCalWindow = MODx.load({
+ xtype: 'mxcalendars-window-mxcalendar-update',
+ record: this.menu.record,
+ listeners: {
+ 'success': {fn: this.refresh, scope: this}
+ }
+ });
+ this.updateCalWindow.show(e.target);
+ //this.updateCalWindow.center();
+ },
+ removeCal: function () {
+ MODx.msg.confirm({
+ title: _('mxcalendars.mxcalendars_remove'),
+ text: _('mxcalendars.mxcalendars_remove_confirm'),
+ url: this.config.url,
+ params: {
+ action: 'mgr/events/remove',
+ id: this.menu.record.id
+ },
+ listeners: {
+ 'success': {fn: this.refresh, scope: this}
+ }
+ });
+ },
+ duplicateEvent: function (btn, e) {
+ if (this.createCalWindow) {
+ this.createCalWindow.close();
+ }
+ let cloneRec = this.menu.record;
+ cloneRec.title = '(' + _('mxcalendars.label_duplicate') + ') ' + cloneRec.title;
+ this.createCalWindow = MODx.load({
+ xtype: 'mxcalendars-window-mxcalendar-create',
+ record: cloneRec
+ });
+ this.createCalWindow.show(e.target);
+ }
});
-Ext.reg('mxcalendars-grid-events',mxcCore.grid.events);
+Ext.reg('mxcalendars-grid-events', mxcCore.grid.events);
-mxcCore.window.CreateCal = function(config) {
+mxcCore.window.CreateCal = function (config) {
config = config || {};
- Ext.applyIf(config,{
- title: _('mxcalendars.event_title_create')
- ,autoHeight: false
- ,height: Ext.getBody().getViewSize().height*.85
- ,autoScroll: true
- ,id: 'CreateCal'
- ,url: mxcCore.config.connectorUrl
- ,width: 870
- ,baseParams: {
+ Ext.applyIf(config, {
+ title: _('mxcalendars.event_title_create'),
+ autoHeight: false,
+ height: Ext.getBody().getViewSize().height * 0.85,
+ autoScroll: true,
+ id: 'CreateCal',
+ url: mxcCore.config.connectorUrl,
+ width: 870,
+ baseParams: {
action: 'mgr/events/create'
- }
- ,closeAction: 'hide'
- ,border: false
- ,bodyStyle: 'padding:15px'
- ,plain:true
- ,fieldDefaults: {
+ },
+ closeAction: 'hide',
+ border: false,
+ bodyStyle: 'padding:15px',
+ plain: true,
+ fieldDefaults: {
//msgTarget: 'side'
- }
- ,defaults: {
- // applied to each contained item
- // nothing this time
- anchor:'100%'
- ,layout: 'Form'
- ,labelWidth: '100'
- ,cellCls: 'valign-center'
- }
- ,items:
- [{
- xtype: 'container',
- anchor: '0',
- layout: 'column',
- defaultType: 'container',
- defaults: {
- layout:'form',
- defaultType: 'textfield',
- labelAlign: 'left',
- anchor: '0'
- //,msgTarget: 'side'
- },
- items: [
- {
- // Left Column
- columnWidth: .5,
- items: [{
- xtype: 'combo',
- displayField: 'key',
- valueField: 'key',
- forceSelection: true,
- store: new Ext.data.JsonStore({
- root: 'results',
- idProperty: 'key',
- url: mxcCore.config.connectorUrl,
- baseParams: {
- action: 'stores/getcontexts'
- },
- fields: [
- 'key',
- ]
- }),
- mode: 'remote',
- triggerAction: 'all',
- fieldLabel: _('mxcalendars.grid_col_context'),
- name: 'context',
- hiddenName: 'context',
- id: 'ccontext',
- allowBlank: mxcCore.config.isAdministrator ? true : false,
- typeAhead:true,
- minChars:1,
- emptyText:_('mxcalendars.label_select_context'),
- valueNotFoundText:_('mxcalendars.label_select_context_err'),
- anchor:'100%',
- value: config.record.context
- },{
- fieldLabel: _('mxcalendars.label_title'),
- name: 'title',
- hiddenname: 'title',
- id: 'ctitle',
- allowBlank: false,
- anchor:'100%',
- value: config.record.title
- },{
- xtype: 'superboxselect',
- displayField: 'name',
- valueField: 'id',
- forceSelection: true,
- store: new Ext.data.JsonStore({
- root: 'results',
- idProperty: 'id',
- url: mxcCore.config.connectorUrl,
- baseParams: {
- action: 'stores/getcategories'
- },
- fields: [
- 'id', 'name'
- ]
- }),
- mode: 'remote',
- triggerAction: 'all',
- fieldLabel: _('mxcalendars.grid_col_category'),
- name: 'categoryid',
- hiddenName: 'categoryid',
- id: 'ccategoryid',
- allowBlank: mxcCore.config.category_required ? true : false,
- typeAhead:true,
- minChars:1,
- emptyText:_('mxcalendars.label_select_category'),
- valueNotFoundText:_('mxcalendars.label_select_category_err'),
- anchor:'100%',
- value: config.record.categoryid
- }]
- },{
- // Right Column
- columnWidth: .5,
- items: [{
- xtype: 'combo',
- displayField: 'name',
- valueField: 'id',
- forceSelection: true,
- store: new Ext.data.JsonStore({
- root: 'results',
- idProperty: 'id',
- url: mxcCore.config.connectorUrl,
- baseParams: {
- action: 'stores/getcalendars'
- },
- fields: [
- 'id', 'name'
- ]
- }),
- mode: 'remote',
- triggerAction: 'all',
- fieldLabel: _('mxcalendars.grid_col_calendar'),
- name: 'calendar_id',
- hiddenName: 'calendar_id',
- id: 'ccalendar_id',
- allowBlank: true,
- typeAhead:true,
- minChars:1,
- emptyText:_('mxcalendars.label_select_calendar'),
- valueNotFoundText:_('mxcalendars.label_select_category_err'),
- anchor:'100%',
- value: config.record.calendar_id
- },{
- xtype: 'container',
- labelWidth: '250',
- //boxLabel: _('mxcalendars.label_allday'),
- combineErrors: true,
- msgTarget : 'side',
- layout: 'hbox',
- defaults: {
- flex: 1,
- hideLabel: true
+ },
+ defaults: {
+ // applied to each contained item
+ // nothing this time
+ anchor: '100%',
+ layout: 'Form',
+ labelWidth: '100',
+ cellCls: 'valign-center'
+ },
+ items: [
+ {
+ xtype: 'container',
+ anchor: '0',
+ layout: 'column',
+ defaultType: 'container',
+ defaults: {
+ layout: 'form',
+ defaultType: 'textfield',
+ labelAlign: 'left',
+ anchor: '0'
+ //,msgTarget: 'side'
+ },
+ items: [
+ {
+ // Left Column
+ columnWidth: 0.5,
+ items: [
+ {
+ xtype: 'combo',
+ displayField: 'key',
+ valueField: 'key',
+ forceSelection: true,
+ store: new Ext.data.JsonStore({
+ root: 'results',
+ idProperty: 'key',
+ url: mxcCore.config.connectorUrl,
+ baseParams: {
+ action: 'stores/getcontexts'
+ },
+ fields: [
+ 'key',
+ ]
+ }),
+ mode: 'remote',
+ triggerAction: 'all',
+ fieldLabel: _('mxcalendars.grid_col_context'),
+ name: 'context',
+ hiddenName: 'context',
+ id: 'ccontext',
+ allowBlank: mxcCore.config.isAdministrator ? true : false,
+ typeAhead: true,
+ minChars: 1,
+ emptyText: _('mxcalendars.label_select_context'),
+ valueNotFoundText: _('mxcalendars.label_select_context_err'),
+ anchor: '100%',
+ value: config.record.context
+ }, {
+ fieldLabel: _('mxcalendars.label_title'),
+ name: 'title',
+ hiddenname: 'title',
+ id: 'ctitle',
+ allowBlank: false,
+ anchor: '100%',
+ value: config.record.title
+ }, {
+ xtype: 'superboxselect',
+ displayField: 'name',
+ valueField: 'id',
+ forceSelection: true,
+ store: new Ext.data.JsonStore({
+ root: 'results',
+ idProperty: 'id',
+ url: mxcCore.config.connectorUrl,
+ baseParams: {
+ action: 'stores/getcategories'
+ },
+ fields: [
+ 'id', 'name'
+ ]
+ }),
+ mode: 'remote',
+ triggerAction: 'all',
+ fieldLabel: _('mxcalendars.grid_col_category'),
+ name: 'categoryid',
+ hiddenName: 'categoryid',
+ id: 'ccategoryid',
+ allowBlank: mxcCore.config.category_required ? true : false,
+ typeAhead: true,
+ minChars: 1,
+ emptyText: _('mxcalendars.label_select_category'),
+ valueNotFoundText: _('mxcalendars.label_select_category_err'),
+ anchor: '100%',
+ value: config.record.categoryid
+ }
+ ]
+ }, {
+ // Right Column
+ columnWidth: 0.5,
+ items: [{
+ xtype: 'combo',
+ displayField: 'name',
+ valueField: 'id',
+ forceSelection: true,
+ store: new Ext.data.JsonStore({
+ root: 'results',
+ idProperty: 'id',
+ url: mxcCore.config.connectorUrl,
+ baseParams: {
+ action: 'stores/getcalendars'
},
- items: [
- {boxLabel: _('mxcalendars.label_allday')
- ,name:'allday'
- ,id:'callday'
- ,xtype:'checkbox'
- ,checked: config.record.allday ? true : false
- ,listeners:{check:{fn:function(tht, value) {
+ fields: [
+ 'id', 'name'
+ ]
+ }),
+ mode: 'remote',
+ triggerAction: 'all',
+ fieldLabel: _('mxcalendars.grid_col_calendar'),
+ name: 'calendar_id',
+ hiddenName: 'calendar_id',
+ id: 'ccalendar_id',
+ allowBlank: true,
+ typeAhead: true,
+ minChars: 1,
+ emptyText: _('mxcalendars.label_select_calendar'),
+ valueNotFoundText: _('mxcalendars.label_select_category_err'),
+ anchor: '100%',
+ value: config.record.calendar_id
+ }, {
+ xtype: 'container',
+ labelWidth: '250',
+ //boxLabel: _('mxcalendars.label_allday'),
+ combineErrors: true,
+ msgTarget: 'side',
+ layout: 'hbox',
+ defaults: {
+ flex: 1,
+ hideLabel: true
+ },
+ items: [
+ {
+ boxLabel: _('mxcalendars.label_allday'),
+ name: 'allday',
+ id: 'callday',
+ xtype: 'checkbox',
+ checked: config.record.allday ? true : false,
+ listeners: {
+ check: {
+ fn: function (tht, value) {
- var calldayFlag = Ext.getCmp('callday');
-
- var edt = Ext.getCmp('cenddate_time');
- var sdt = Ext.getCmp('cstartdate_time');
- var ed = Ext.getCmp('cenddate_date');
- var sd = Ext.getCmp('cstartdate_date');
-
- //Ext.getCmp('cstartdate_fields').label.update(_('mxcalendars.startdate_col_label'));
-
- if(calldayFlag.getValue() === true){
+ let calldayFlag = Ext.getCmp('callday');
+ let edt = Ext.getCmp('cenddate_time');
+ let sdt = Ext.getCmp('cstartdate_time');
+ let ed = Ext.getCmp('cenddate_date');
+ let sd = Ext.getCmp('cstartdate_date');
- sdt.hide().setValue(mxcCore.config.mgr_allday_start);
- //Ext.getCmp('cenddate_fields').hide();
- Ext.getCmp('cenddate_time').hide();
- edt.setValue(mxcCore.config.mgr_allday_end);
+ //Ext.getCmp('cstartdate_fields').label.update(_('mxcalendars.startdate_col_label'));
+
+ if (calldayFlag.getValue() === true) {
+
+ sdt.hide().setValue(mxcCore.config.mgr_allday_start);
+ //Ext.getCmp('cenddate_fields').hide();
+ Ext.getCmp('cenddate_time').hide();
+ edt.setValue(mxcCore.config.mgr_allday_end);
+
+ if (ed.getValue() !== sd.getValue()) {
+ ed.setValue(sd.getValue());
+ }
+
+ } else {
+ sdt.show();
+ //Ext.getCmp('cenddate_fields').show();
+ Ext.getCmp('cenddate_time').show();
+ //Ext.getCmp('cstartdate_fields').label.update(_('mxcalendars.label_startdate'));
+ }
- if(ed.getValue() !== sd.getValue()){
- ed.setValue(sd.getValue());
}
-
- } else {
- sdt.show();
- //Ext.getCmp('cenddate_fields').show();
- Ext.getCmp('cenddate_time').show();
- //Ext.getCmp('cstartdate_fields').label.update(_('mxcalendars.label_startdate'));
}
-
- }}}
}
-
- ]
- },{
- xtype: 'container',
+ }
+
+ ]
+ }, {
+ xtype: 'container',
labelWidth: '250',
id: 'cstartdate_fields',
- fieldLabel: _('mxcalendars.label_startdate'),
- combineErrors: true,
- msgTarget : 'side',
- layout: 'hbox',
- defaults: {
- flex: 1,
- hideLabel: true
- },
- items: [
- {
- xtype : 'datefield',
- name : 'startdate_date',
- id : 'cstartdate_date',
- format : mxcCore.config.mgr_dateformat,
- fieldLabel: 'Start',
- padding: '0 5 0 0',
- allowBlank: false,
- width: 150,
+ fieldLabel: _('mxcalendars.label_startdate'),
+ combineErrors: true,
+ msgTarget: 'side',
+ layout: 'hbox',
+ defaults: {
+ flex: 1,
+ hideLabel: true
+ },
+ items: [
+ {
+ xtype: 'datefield',
+ name: 'startdate_date',
+ id: 'cstartdate_date',
+ format: mxcCore.config.mgr_dateformat,
+ fieldLabel: 'Start',
+ padding: '0 5 0 0',
+ allowBlank: true,
+ width: 150,
value: config.record.startdate_date,
- listeners:{change:{fn:function(item, value) {
- var ed = Ext.getCmp('cenddate_date');
- if(ed.getValue() === ''){
- ed.setValue(value);
- }
-
- var alldayFlag = Ext.getCmp('callday');
- if(alldayFlag.getValue() === true){
- Ext.getCmp('cenddate_date').setValue(value);
+ listeners: {
+ change: {
+ fn: function (item, value) {
+ let ed = Ext.getCmp('cenddate_date');
+ if (ed.getValue() === '') {
+ ed.setValue(value);
+ }
+
+ let alldayFlag = Ext.getCmp('callday');
+ if (alldayFlag.getValue() === true) {
+ Ext.getCmp('cenddate_date').setValue(value);
+ }
+
+ }
}
-
- }}
}
-
- },
- {
- xtype : 'timefield',
- name : 'startdate_time',
- id : 'cstartdate_time',
- format : mxcCore.config.mgr_timeformat,
- fieldLabel: 'Time',
- margin: '0 5 0 0',
- allowBlank: false,
- width: 120,
- value: config.record.startdate_time,
+
+ },
+ {
+ xtype: 'timefield',
+ name: 'startdate_time',
+ id: 'cstartdate_time',
+ format: mxcCore.config.mgr_timeformat,
+ fieldLabel: 'Time',
+ margin: '0 5 0 0',
+ allowBlank: true,
+ width: 120,
+ value: config.record.startdate_time,
hidden: config.record.allday ? true : false
- }
- ]
- },{
- xtype: 'container',
- fieldLabel: _('mxcalendars.label_enddate'),
- combineErrors: true,
- id: 'cenddate_fields',
- msgTarget : 'side',
- layout: 'hbox',
- defaults: {
- flex: 1,
- hideLabel: true
- },
- items: [
- {
- xtype : 'datefield',
- name : 'enddate_date',
- id: 'cenddate_date',
- format : mxcCore.config.mgr_dateformat,
- fieldLabel: 'End',
- padding: '0 5 0 0',
- allowBlank: false,
- width: 150,
- value: config.record.enddate_date,
- hidden: config.record.allday ? true : false
- },
- {
- xtype : 'timefield',
- name : 'enddate_time',
- id : 'cenddate_time',
- format : mxcCore.config.mgr_timeformat,
- fieldLabel: 'End Time',
- margin: '0 5 0 0',
- allowBlank: false,
- width: 120,
- value: config.record.enddate_time,
- hidden: config.record.allday ? true : false
- }
- ]
- }]
- }]
- },{name: 'repeating',id: 'crepeating',xtype:'hidden',value:config.record.repeating?1:0}
- ,{
- xtype:'fieldset',
- checkboxToggle:true,
- title: _('mxcalendars.label_repeating_event'),
- collapsed: config.record.repeating ? false : true,
- autoHeight: true,
- layout: 'column',
- border: 'false',
- listeners: {
- 'beforecollapse' : function(panel,ani) {
- // Hide all the form fields you need to hide
- Ext.getCmp('crepeating').setValue(0);
- return true; // this will avoid collapse of the field set
- },
- 'beforeexpand' : function(panel,ani) {
- // Display all the fields
- Ext.getCmp('crepeating').setValue(1);
- return true; // this will avoid the default expand behaviour
- }
+ }
+ ]
+ }, {
+ xtype: 'container',
+ fieldLabel: _('mxcalendars.label_enddate'),
+ combineErrors: true,
+ id: 'cenddate_fields',
+ msgTarget: 'side',
+ layout: 'hbox',
+ defaults: {
+ flex: 1,
+ hideLabel: true
+ },
+ items: [
+ {
+ xtype: 'datefield',
+ name: 'enddate_date',
+ id: 'cenddate_date',
+ format: mxcCore.config.mgr_dateformat,
+ fieldLabel: 'End',
+ padding: '0 5 0 0',
+ allowBlank: true,
+ width: 150,
+ value: config.record.enddate_date,
+ hidden: config.record.allday ? true : false
+ },
+ {
+ xtype: 'timefield',
+ name: 'enddate_time',
+ id: 'cenddate_time',
+ format: mxcCore.config.mgr_timeformat,
+ fieldLabel: 'End Time',
+ margin: '0 5 0 0',
+ allowBlank: true,
+ width: 120,
+ value: config.record.enddate_time,
+ hidden: config.record.allday ? true : false
+ }
+ ]
+ }]
+ }]
+ },
+ {name: 'repeating', id: 'crepeating', xtype: 'hidden', value: config.record.repeating ? 1 : 0},
+ {
+ xtype: 'fieldset',
+ checkboxToggle: true,
+ title: _('mxcalendars.label_repeating_event'),
+ collapsed: config.record.repeating === 'ano' ? false : true,
+ autoHeight: true,
+ layout: 'column',
+ border: 'false',
+ listeners: {
+ 'beforecollapse': function (panel, ani) {
+ // Hide all the form fields you need to hide
+ Ext.getCmp('crepeating').setValue(0);
+ return true; // this will avoid collapse of the field set
},
- items :[
- {
- columnWidth: .9,
- border: false,
- layout: 'form',
- hideMode: 'offsets',
- items: [
- {
- fieldLabel: 'Occurs'
- ,name: 'repeattype'
- ,id: 'crepeattype'
- ,xtype:'combo'
- ,mode: 'local'
- ,anchor: '100%'
- ,hideLabel: false
- ,labelWidth: 100
- ,store: new Ext.data.ArrayStore({
- id: 0,
- fields: ['v', 'measure'],
- data: [[0, _('mxcalendars.label_daily')],[1, _('mxcalendars.label_weekly')],[2, _('mxcalendars.label_monthly')],[3, _('mxcalendars.label_yearly')]]
- })
- ,triggerAction: 'all'
- ,displayField: 'measure'
- ,valueField: 'v'
- ,editable: true
- ,cls: 'mxcFloat'
- ,value: config.record.repeattype
- ,listeners:{select:{fn:function(combo, value) {
- var rt = Ext.getCmp('crepeattype');
- if(rt.getValue() === 1){
- Ext.getCmp('crepeaton').show();
- Ext.getCmp('crepeaton').doLayout();
- } else { Ext.getCmp('crepeaton').hide(); }
- }}
+ 'beforeexpand': function (panel, ani) {
+ // Display all the fields
+ Ext.getCmp('crepeating').setValue(1);
+ return true; // this will avoid the default expand behaviour
+ }
+ },
+ items: [
+ {
+ columnWidth: 0.9,
+ border: false,
+ layout: 'form',
+ hideMode: 'offsets',
+ items: [
+ {
+ fieldLabel: 'Occurs',
+ name: 'repeattype',
+ id: 'crepeattype',
+ xtype: 'combo',
+ mode: 'local',
+ anchor: '100%',
+ hideLabel: false,
+ labelWidth: 100,
+ store: new Ext.data.ArrayStore({
+ id: 0,
+ fields: ['v', 'measure'],
+ data: [[0, _('mxcalendars.label_daily')], [1, _('mxcalendars.label_weekly')], [2, _('mxcalendars.label_monthly')], [3, _('mxcalendars.label_yearly')]]
+ }),
+ triggerAction: 'all',
+ displayField: 'measure',
+ valueField: 'v',
+ editable: true,
+ cls: 'mxcFloat',
+ value: config.record.repeattype,
+ listeners: {
+ select: {
+ fn: function (combo, value) {
+ let rt = Ext.getCmp('crepeattype');
+ if (rt.getValue() === 1) {
+ Ext.getCmp('crepeaton').show();
+ Ext.getCmp('crepeaton').doLayout();
+ } else {
+ Ext.getCmp('crepeaton').hide();
+ }
+ }
}
- ,value: config.record.repeattype
- },{
- fieldLabel: _('mxcalendars.label_repeaton')
- ,name: 'repeaton'
- ,id: 'crepeaton'
- ,xtype: 'checkboxgroup'
- ,anchor: '100%'
- ,hideLabel: false
- ,labelWidth: 100
- ,hidden: config.record.repeattype == 1 ? false : true // hide on load
- ,items: [
- {boxLabel: _('mxcalendars.label_sunday'), name: 'cb-auto-1', value: -1, checked: config.record.repeaton.indexOf(',-1,')!=-1 ? true : false },
- {boxLabel: _('mxcalendars.label_monday'), name: 'cb-auto-2', value: 0, checked: config.record.repeaton.indexOf(',0,')!=-1 ? true : false },
- {boxLabel: _('mxcalendars.label_tuesday'), name: 'cb-auto-3', value: 1, checked: config.record.repeaton.indexOf(',1,')!=-1 ? true : false },
- {boxLabel: _('mxcalendars.label_wednesday'), name: 'cb-auto-4', value: 2, checked: config.record.repeaton.indexOf(',2,')!=-1 ? true : false },
- {boxLabel: _('mxcalendars.label_thursday'), name: 'cb-auto-5', value: 3, checked: config.record.repeaton.indexOf(',3,')!=-1 ? true : false },
- {boxLabel: _('mxcalendars.label_friday'), name: 'cb-auto-6', value: 4, checked: config.record.repeaton.indexOf(',4,')!=-1 ? true : false },
- {boxLabel: _('mxcalendars.label_saturday'), name: 'cb-auto-7', value: 5, checked: config.record.repeaton.indexOf(',5,')!=-1 ? true : false }
- ]
- ,value: config.record.repeaton
- },
- {
- fieldLabel: _('mxcalendars.label_repeat_frequency')
- ,name: 'repeatfrequency'
- ,id: 'crepeatfrequency'
- ,xtype: 'combo'
- ,mode: 'local'
- ,hideLabel: false
- ,labelWidth: 100
- ,anchor: '100%'
- ,store: new Ext.data.ArrayStore({
- id: 0,
- fields: ['counter'],
- data: [[],[1],[2],[3],[4],[5],[6],[7],[8],[9],[10],[11],[12],[13],[14],[15],[16],[17],[18],[19],[20],[21],[22],[23],[24],[25],[26],[27],[28],[29],[30]]
- })
- ,triggerAction: 'all'
- ,displayField: 'counter'
- ,valueField: 'counter'
- ,editable: true
- ,value: config.record.repeatfrequency
- ,listeners: {
- render: function(c) {
+ }
+ //, value: config.record.repeattype
+ },
+ {
+ fieldLabel: _('mxcalendars.label_repeaton'),
+ name: 'repeaton',
+ id: 'crepeaton',
+ xtype: 'checkboxgroup',
+ anchor: '100%',
+ hideLabel: false,
+ labelWidth: 100,
+ hidden: config.record.repeattype == 1 ? false : true, // hide on load
+ items: [
+ {
+ boxLabel: _('mxcalendars.label_sunday'),
+ name: 'cb-auto-1',
+ value: -1,
+ checked: config.record.repeaton.indexOf(',-1,') != -1 ? true : false
+ },
+ {
+ boxLabel: _('mxcalendars.label_monday'),
+ name: 'cb-auto-2',
+ value: 0,
+ checked: config.record.repeaton.indexOf(',0,') != -1 ? true : false
+ },
+ {
+ boxLabel: _('mxcalendars.label_tuesday'),
+ name: 'cb-auto-3',
+ value: 1,
+ checked: config.record.repeaton.indexOf(',1,') != -1 ? true : false
+ },
+ {
+ boxLabel: _('mxcalendars.label_wednesday'),
+ name: 'cb-auto-4',
+ value: 2,
+ checked: config.record.repeaton.indexOf(',2,') != -1 ? true : false
+ },
+ {
+ boxLabel: _('mxcalendars.label_thursday'),
+ name: 'cb-auto-5',
+ value: 3,
+ checked: config.record.repeaton.indexOf(',3,') != -1 ? true : false
+ },
+ {
+ boxLabel: _('mxcalendars.label_friday'),
+ name: 'cb-auto-6',
+ value: 4,
+ checked: config.record.repeaton.indexOf(',4,') != -1 ? true : false
+ },
+ {
+ boxLabel: _('mxcalendars.label_saturday'),
+ name: 'cb-auto-7',
+ value: 5,
+ checked: config.record.repeaton.indexOf(',5,') != -1 ? true : false
+ }
+ ],
+ value: config.record.repeaton
+ },
+ {
+ fieldLabel: _('mxcalendars.label_repeat_frequency'),
+ name: 'repeatfrequency',
+ id: 'crepeatfrequency',
+ xtype: 'combo',
+ mode: 'local',
+ hideLabel: false,
+ labelWidth: 100,
+ anchor: '100%',
+ store: new Ext.data.ArrayStore({
+ id: 0,
+ fields: ['counter'],
+ data: [[], [1], [2], [3], [4], [5], [6], [7], [8], [9], [10], [11], [12], [13], [14], [15], [16], [17], [18], [19], [20], [21], [22], [23], [24], [25], [26], [27], [28], [29], [30]]
+ }),
+ triggerAction: 'all',
+ displayField: 'counter',
+ valueField: 'counter',
+ editable: true,
+ value: config.record.repeatfrequency,
+ listeners: {
+ render: function (c) {
Ext.QuickTips.register({
target: c.getEl(),
text: _('mxcalendars.tip_repeaton')
});
- }
}
- },{
- fieldLabel: _('mxcalendars.label_repeat_last_occurance')
- ,name: 'repeatenddate'
- ,id: 'crepeatenddate'
- ,hideLabel: false
- ,labelWidth: 100
- ,anchor: '100% 100%'
- ,format : mxcCore.config.mgr_dateformat
- ,allowBlank:false
- ,xtype: 'datefield'
- ,value: config.record.repeatenddate
- ,submitValue: false
}
- ]
- }
- ]
- },{
- xtype: 'container'
- ,anchor: '100%'
- ,layout: 'form'
- ,items: [
- {
- xtype:'tabpanel'
- ,plain:true
- ,activeTab: 0
- ,height:385
- //,autoHeight: true
- ,width:840
- ,defaults:{bodyStyle:'padding:10px',layout:'form'}
- ,items:[
- {
- cls: 'x-plain',
- title: _('mxcalendars.label_description'),
- layout: 'fit',
- items: {
- xtype: mxcCore.config.event_desc_type == 'htmleditor' ? 'textarea' : mxcCore.config.event_desc_type
- ,name: 'description'
- ,hiddenName: 'description'
- ,id: 'cdescription'
- ,value: config.record.description
- }
- ,listeners:{
- activate : function(tabpanel){
- //if(MODx.config.use_editor && MODx.loadRTE && mxcCore.config.event_desc_type == 'htmleditor'){
- // MODx.loadRTE('description-'+config.record.id);
- //}
-
- if (MODx.loadRTE) {
- MODx.loadRTE('cdescription'); // Will transform the textarea with ID "description" to a RTE
- // MODx.loadRTE(['description1','description2']);
- }
+ }, {
+ fieldLabel: _('mxcalendars.label_repeat_last_occurance'),
+ name: 'repeatenddate',
+ id: 'crepeatenddate',
+ hideLabel: false,
+ labelWidth: 100,
+ anchor: '100% 100%',
+ format: mxcCore.config.mgr_dateformat,
+ allowBlank: true,
+ xtype: 'datefield',
+ value: config.record.repeatenddate,
+ submitValue: false
+ }
+ ]
+ }
+ ]
+ },
+ {
+ xtype: 'container',
+ anchor: '100%',
+ layout: 'form',
+ items: [{
+ xtype: 'tabpanel',
+ plain: true,
+ activeTab: 0,
+ height: 385,
+ //,autoHeight: true
+ width: 840,
+ defaults: {bodyStyle: 'padding:10px', layout: 'form'},
+ items: [
+ {
+ cls: 'x-plain',
+ title: _('mxcalendars.label_description'),
+ layout: 'fit',
+ items: {
+ xtype: mxcCore.config.event_desc_type == 'htmleditor' ? 'textarea' : mxcCore.config.event_desc_type,
+ name: 'description',
+ hiddenName: 'description',
+ id: 'cdescription',
+ value: config.record.description
+ },
+ listeners: {
+ activate: function (tabpanel) {
+ //if(MODx.config.use_editor && MODx.loadRTE && mxcCore.config.event_desc_type == 'htmleditor'){
+ // MODx.loadRTE('description-'+config.record.id);
+ //}
- }
+ if (MODx.loadRTE) {
+ MODx.loadRTE('cdescription'); // Will transform the textarea with ID "description" to a RTE
+ // MODx.loadRTE(['description1','description2']);
}
- },{
- cls: 'x-plain',
- title: _('mxcalendars.label_content'),
- layout: 'fit',
- items: {
- xtype: mxcCore.config.event_desc_type == 'htmleditor' ? 'textarea' : mxcCore.config.event_desc_type
- ,name: 'content'
- ,hiddenName: 'content'
- ,id: 'ccontent'
- ,value: config.record.content
- }
- ,listeners:{
- activate : function(tabpanel){
- if (MODx.config.use_editor && MODx.loadRTE){
- MODx.loadRTE('ccontent');
- }
- }
+
+ }
+ }
+ },
+ {
+ cls: 'x-plain',
+ title: _('mxcalendars.label_content'),
+ layout: 'fit',
+ items:{
+ xtype: mxcCore.config.event_desc_type == 'htmleditor' ? 'textarea' : mxcCore.config.event_desc_type,
+ name: 'content',
+ hiddenName: 'content',
+ id: 'ccontent',
+ value: config.record.content
+ },
+ listeners: {
+ activate: function (tabpanel) {
+ if (MODx.config.use_editor && MODx.loadRTE) {
+ MODx.loadRTE('ccontent');
}
- },{
- cls: 'x-plain',
- title: _('mxcalendars.label_images'),
- layout: 'fit',
- items: {
- xtype: 'mxc-images-grid'
- ,id: 'gridimages'
- }
- },{
- cls: 'x-plain',
- title: _('mxcalendars.label_videos'),
- layout: 'fit',
- items: {
- xtype: 'mxc-videos-grid'
- ,id: 'gridvideos'
- }
- },{
- title: _('mxcalendars.label_location')
- ,defaults: {width:230}
- ,defaultType:'textfield'
- ,items:[{
- fieldLabel: _('mxcalendars.label_name')
- ,name:'location_name'
- ,id: 'clocation_name'
- ,value: config.record.location_name
- },{
- fieldLabel: _('mxcalendars.label_address')
- ,name:'location_address'
- ,id:'clocation_address'
- ,value: config.record.location_address
- },{
- boxLabel: _('mxcalendars.label_display_map')
- ,name:'map'
- ,id:'cmap'
- ,xtype:'checkbox'
- ,checked: config.record.map ? true : false
- }]
- },{
- title:_('mxcalendars.label_link'),
- defaults: {width: 230},
- defaultType: 'textfield',
- items: [{
- fieldLabel: 'Link'
- ,name: 'link'
- ,id: 'clink'
- ,allowBlank:false
- ,value: config.record.link
- },{
- fieldLabel: _('mxcalendars.label_link_rel')
- ,name: 'linkrel'
- ,id: 'clinkrel'
- ,value: config.record.linkrel
- },{
- fieldLabel: _('mxcalendars.label_link_target')
- ,name: 'linktarget'
- ,id: 'clinktarget'
- ,xtype: 'combo'
- ,mode: 'local'
- ,store: new Ext.data.ArrayStore({
- id: 0,
- fields: ['tt'],
- data: [['_self'],['_new'],['_blank']]
- })
- ,triggerAction: 'all'
- ,displayField: 'tt'
- ,valueField: 'tt'
- ,editable: true
- ,width: 'auto'
- ,anchor: '30%'
- ,value: config.record.linktarget
- }]
- },{
- title:"Form"
- ,defaults: {width:230}
- ,items: [{
- xtype: 'combo',
- displayField: 'name',
- valueField: 'name',
- forceSelection: true,
- store: new Ext.data.JsonStore({
- root: 'results',
- idProperty: 'id',
- url: mxcCore.config.connectorUrl,
- baseParams: {
- action: 'stores/getformchunks'
- },
- fields: [
- 'id','name','description',
- ]
- }),
- mode: 'remote',
- triggerAction: 'all',
- fieldLabel: _('mxcalendars.grid_col_formchunk'),
- name: 'form_chunk',
- hiddenName: 'form_chunk',
- id: 'cform_chunk',
- allowBlank: true,
- typeAhead:true,
- minChars:1,
- emptyText:_('mxcalendars.label_select_form'),
- value: config.record.form_chunk,
- valueNotFoundText:_('mxcalendars.label_select_form_err'),
- anchor:'100%'
- }]
}
- ]
- }
- ]
- },{
- xtype: 'checkbox'
- ,boxLabel: _('mxcalendars.category_active_col_label')
- ,id: 'cactive'
- ,name: 'active'
- ,hiddenName: 'active'
- ,checked: true
- ,value: 1
+ }
+ },
+ {
+ cls: 'x-plain',
+ title: _('mxcalendars.label_images'),
+ layout: 'fit',
+ items: {
+ xtype: 'mxc-images-grid',
+ id: 'gridimages'
+ }
+ },
+ {
+ cls: 'x-plain',
+ title: _('mxcalendars.label_videos'),
+ layout: 'fit',
+ items: {
+ xtype: 'mxc-videos-grid',
+ id: 'gridvideos'
+ }
+ },
+ {
+ title: _('mxcalendars.label_location'),
+ defaults: {width: 230},
+ defaultType: 'textfield',
+ items: [
+ {
+ fieldLabel: _('mxcalendars.label_name'),
+ name: 'location_name',
+ id: 'clocation_name',
+ value: config.record.location_name
+ },
+ {
+ fieldLabel: _('mxcalendars.label_address'),
+ name: 'location_address',
+ id: 'clocation_address',
+ value: config.record.location_address
+ },
+ {
+ boxLabel: _('mxcalendars.label_display_map'),
+ name: 'map',
+ id: 'cmap',
+ xtype: 'checkbox',
+ checked: config.record.map ? true : false
+ }
+ ]
+ },
+ {
+ title: _('mxcalendars.label_price'),
+ defaults: {width: 230},
+ defaultType: 'textfield',
+ items: [{
+ fieldLabel: _('mxcalendars.label_price'),
+ name: 'label_price',
+ id: 'cprice',
+ value: config.record.price
+ }]
+ },
+ {
+ title: _('mxcalendars.label_food'),
+ defaults: {width: 230},
+ defaultType: 'textfield',
+ items: [{
+ fieldLabel: _('mxcalendars.label_food'),
+ name: 'label_food',
+ id: 'cfood',
+ value: config.record.food
+ }]
+ },
+ {
+ title: _('mxcalendars.label_age'),
+ defaults: {width: 230},
+ defaultType: 'textfield',
+ items: [{
+ fieldLabel: _('mxcalendars.label_age'),
+ name: 'label_age',
+ id: 'cage',
+ value: config.record.age
+ }]
+ },
+ {
+ title: _('mxcalendars.label_capacity'),
+ defaults: {width: 230},
+ defaultType: 'textfield',
+ items: [{
+ fieldLabel: _('mxcalendars.label_capacity'),
+ name: 'label_capacity',
+ id: 'ccapacity',
+ value: config.record.capacity
+ }]
+ },
+ {
+ title: _('mxcalendars.label_link'),
+ defaults: {width: 230},
+ defaultType: 'textfield',
+ items: [
+ {
+ fieldLabel: 'Link',
+ name: 'link',
+ id: 'clink',
+ allowBlank: true,
+ value: config.record.link
+ },
+ // fieldLabel: _('mxcalendars.label_link_rel')
+ // , name: 'linkrel'
+ // , id: 'clinkrel'
+ // , value: config.record.linkrel
+ // }, {
+ {
+ fieldLabel: _('mxcalendars.label_link_target'),
+ name: 'linktarget',
+ id: 'clinktarget',
+ xtype: 'combo',
+ mode: 'local',
+ store: new Ext.data.ArrayStore({
+ id: 0,
+ fields: ['tt'],
+ data: [['_self'], ['_new'], ['_blank']]
+ }),
+ triggerAction: 'all',
+ displayField: 'tt',
+ valueField: 'tt',
+ editable: true,
+ width: 'auto',
+ anchor: '30%',
+ value: config.record.linktarget
+ }
+ ]
+ },
+ {
+ title: 'Form',
+ defaults: {width: 230},
+ items: [{
+ xtype: 'combo',
+ displayField: 'name',
+ valueField: 'name',
+ forceSelection: true,
+ store: new Ext.data.JsonStore({
+ root: 'results',
+ idProperty: 'id',
+ url: mxcCore.config.connectorUrl,
+ baseParams: {
+ action: 'stores/getformchunks'
+ },
+ fields: [
+ 'id', 'name', 'description',
+ ]
+ }),
+ mode: 'remote',
+ triggerAction: 'all',
+ fieldLabel: _('mxcalendars.grid_col_formchunk'),
+ name: 'form_chunk',
+ hiddenName: 'form_chunk',
+ id: 'cform_chunk',
+ allowBlank: true,
+ typeAhead: true,
+ minChars: 1,
+ emptyText: _('mxcalendars.label_select_form'),
+ value: config.record.form_chunk,
+ valueNotFoundText: _('mxcalendars.label_select_form_err'),
+ anchor: '100%'
+ }]
+ }
+ ]
}
- ]
-
- ,buttons: [{
- text: _('mxcalendars.label_cancel')
- ,type: 'close'
- ,handler: function()
- {
- Ext.getCmp('CreateCal').hide();
- }
- },{
- text: _('mxcalendars.label_save')
- ,handler: function(){
-
- var repeatDOW = '';
- var rawRepeatOn = Ext.getCmp('crepeaton').getValue();
- ////console.log("RepeatOn: "+rawRepeatOn.join(","));
- for (i = 0; i < rawRepeatOn.length; i++) {
- repeatDOW += ','+rawRepeatOn[i].value;
- ////console.log(rawRepeatOn[i]);
+ ]
+ },
+ {
+ xtype: 'checkbox',
+ boxLabel: _('mxcalendars.category_active_col_label'),
+ id: 'cactive',
+ name: 'active',
+ hiddenName: 'active',
+ checked: true,
+ value: 1
+ }
+ ],
+ buttons: [
+ {
+ text: _('mxcalendars.label_cancel'),
+ type: 'close',
+ handler: function () {
+ Ext.getCmp('CreateCal').hide();
}
- if(repeatDOW.length){repeatDOW+=',';}
- ////console.log("New RepeatON: "+repeatDOW);
- var frmData = {
- title: Ext.getCmp('ctitle').getValue() //req
- ,active: Ext.getCmp('cactive').getValue() === true ? 1 :0
- ,description: Ext.getCmp('cdescription').getValue()
- ,categoryid: Ext.getCmp('ccategoryid').getValue() //req
- ,allday: Ext.getCmp('callday').getValue() === true ? 1 :0
- ,startdate_date: Ext.getCmp('cstartdate_date').getValue() //req
- ,startdate_time: Ext.getCmp('cstartdate_time').getValue() //req
- ,enddate_date: Ext.getCmp('cenddate_date').getValue() //req
- ,enddate_time: Ext.getCmp('cenddate_time').getValue() //req
- ,link: Ext.getCmp('clink').getValue()
- ,linkrel: Ext.getCmp('clinkrel').getValue()
- ,linktarget: Ext.getCmp('clinktarget').getValue()
- ,location_name: Ext.getCmp('clocation_name').getValue()
- ,location_address: Ext.getCmp('clocation_address').getValue()
- ,map: Ext.getCmp('cmap').checked ? 1 : 0
- ,repeating: Ext.getCmp('crepeating').getValue()
- ,repeattype: Ext.getCmp('crepeattype').getValue()
- ,repeaton: repeatDOW //Ext.getCmp('repeaton').getValue()
- ,repeatfrequency: Ext.getCmp('crepeatfrequency').getValue()
- ,repeatenddate: Ext.getCmp('crepeatenddate').getValue()
- ,context: Ext.getCmp('ccontext').getValue()
- ,calendar_id: Ext.getCmp('ccalendar_id').getValue()
- ,form_chunk: Ext.getCmp('cform_chunk').getValue()
+ },
+ {
+ text: _('mxcalendars.label_save'),
+ handler: function () {
+ let repeatDOW = '';
+ let rawRepeatOn = Ext.getCmp('crepeaton').getValue();
+ ////console.log("RepeatOn: "+rawRepeatOn.join(","));
+ for (let i = 0; i < rawRepeatOn.length; i++) {
+ repeatDOW += ',' + rawRepeatOn[i].value;
+ ////console.log(rawRepeatOn[i]);
+ }
+ if (repeatDOW.length) {
+ repeatDOW += ',';
+ }
+ ////console.log("New RepeatON: "+repeatDOW);
+ let frmData = {
+ title: Ext.getCmp('ctitle').getValue(), //req
+ active: Ext.getCmp('cactive').getValue() === true ? 1 : 0,
+ description: Ext.getCmp('cdescription').getValue(),
+ categoryid: Ext.getCmp('ccategoryid').getValue(), //req
+ allday: Ext.getCmp('callday').getValue() === true ? 1 : 0,
+ startdate_date: Ext.getCmp('cstartdate_date').getValue(), //req
+ startdate_time: Ext.getCmp('cstartdate_time').getValue(), //req
+ enddate_date: Ext.getCmp('cenddate_date').getValue(), //req
+ enddate_time: Ext.getCmp('cenddate_time').getValue(), //req
+ link: Ext.getCmp('clink').getValue(),
+ //, linkrel: Ext.getCmp('clinkrel').getValue(),
+ linktarget: Ext.getCmp('clinktarget').getValue(),
+ location_name: Ext.getCmp('clocation_name').getValue(),
+ location_address: Ext.getCmp('clocation_address').getValue(),
+ map: Ext.getCmp('cmap').checked ? 1 : 0,
+ price: Ext.getCmp('cprice').getValue(),
+ food: Ext.getCmp('cfood').getValue(),
+ age: Ext.getCmp('cage').getValue(),
+ capacity: Ext.getCmp('ccapacity').getValue(),
+ repeating: Ext.getCmp('crepeating').getValue(),
+ repeattype: Ext.getCmp('crepeattype').getValue(),
+ repeaton: repeatDOW, //Ext.getCmp('repeaton').getValue(),
+ repeatfrequency: Ext.getCmp('crepeatfrequency').getValue(),
+ repeatenddate: Ext.getCmp('crepeatenddate').getValue(),
+ context: Ext.getCmp('ccontext').getValue(),
+ calendar_id: Ext.getCmp('ccalendar_id').getValue(),
+ form_chunk: Ext.getCmp('cform_chunk').getValue(),
// @TODO move to proper config section
- ,HTTP_MODAUTH: MODx.siteId
- ,action: 'mgr/events/create'
- };
-
- mxcCore.ajax.request({
- url: mxcCore.config.connectorUrl,
+ HTTP_MODAUTH: MODx.siteId,
+ action: 'mgr/events/create'
+ };
+
+ mxcCore.ajax.request({
+ url: mxcCore.config.connectorUrl,
extraParams: {
- //action: 'mgr/events/update'
- },
- params: frmData,
- scope: this,
- success: function(resp, opts) {
- // resp is the XmlHttpRequest object
- var status = Ext.decode(resp.responseText).success;
- if(!status){
- errmsg = '';
- cnt=0;
- Ext.each(Ext.decode(resp.responseText).data, function(op) {
- cnt++;
- errmsg += cnt+') '+op.msg+'
'.$onRichTextEditorInit.'';
-
-?>
diff --git a/core/components/mxcalendars/elements/snippets/snippet.mxcalendars.php b/core/components/mxcalendars/elements/snippets/snippet.mxcalendars.php
index e0b02d8..571cb9f 100644
--- a/core/components/mxcalendars/elements/snippets/snippet.mxcalendars.php
+++ b/core/components/mxcalendars/elements/snippets/snippet.mxcalendars.php
@@ -1,15 +1,17 @@
getService('mxcalendars','mxCalendars',$modx->getOption('mxcalendars.core_path',null,$modx->getOption('core_path').'components/mxcalendars/').'model/mxcalendars/',$scriptProperties);
-if (!($mxcal instanceof mxCalendars)) return 'Error loading instance of mxCalendars.';
+if (!($mxcal instanceof mxCalendars)) {
+ return 'Error loading instance of mxCalendars.';
+}
-include_once($modx->getOption('mxcalendars.core_path',null,$modx->getOption('core_path').'components/mxcalendars/').'processors/mgr/mxcHelper.php');
+include_once($modx->getOption('mxcalendars.core_path',null,$modx->getOption('core_path') . 'components/mxcalendars/') . 'processors/mgr/mxcHelper.php');
/* setup default properties */
$theme = $modx->getOption('theme',$scriptProperties,'default');// default, traditional
@@ -33,7 +35,7 @@
$sort = $modx->getOption('mxc.sort',$scriptProperties,'startdate');
$dir = $modx->getOption('mxc.dir',$scriptProperties,'ASC');
$limit = $modx->getOption('limit',$scriptProperties,'99');
-$limitstart = $modx->getOption('limitstart', $scriptProperties, 0);
+$offset = $modx->getOption('offset',$scriptProperties,0);
//++ Text|Date Formatting properties
$dateFormat = $modx->getOption('dateformat', $scriptProperties, '%Y-%m-%d');
$timeFormat = $modx->getOption('timeformat', $scriptProperties, '%H:%M %p');
@@ -90,20 +92,21 @@
//++ Calendar Options (ver >= 1.1.6d-pr)
// Defaults to blank (ie show all categories).
-if ($categoryFilter = urldecode(isset($_REQUEST['cid']) ? $_REQUEST['cid'] : $modx->getOption('categoryFilter', $scriptProperties, null))) {
+if ($categoryFilter = urldecode(isset($_REQUEST['cid']) ?? $modx->getOption('categoryFilter', $scriptProperties, null))) {
// Adding comma for retrieving events that are category-agnostic (ie have blank category).
$categoryFilter = ",{$categoryFilter}";
}
//++ Calendar Options (ver >= 1.1.0-pl)
// Defaults to blank (ie show all calendars).
-if ($calendarFilter = (isset($_REQUEST['calf']) ? $_REQUEST['calf'] : $modx->getOption('calendarFilter', $scriptProperties, null))) {
+if ($calendarFilter = (isset($_REQUEST['calf']) ?? $modx->getOption('calendarFilter', $scriptProperties, null))) {
// Adding comma for retrieving events that are calendar-agnostic (ie have blank calendar).
$calendarFilter = ",{$calendarFilter}";
-};
+}
//++ Context Options (ver >= 1.1.0-pl)
// Defaults to current context.
// Could be blank (ie show all contexts).
-if ($contextFilter = ','.(isset($_REQUEST['conf']) ? $_REQUEST['conf'] : $modx->getOption('contextFilter',$scriptProperties, $modx->context->key))) {
+if (isset($_REQUEST['conf']) ?? $modx->getOption('contextFilter', $scriptProperties, $modx->context->key)) {
+ $contextFilter = ',' . (isset($_REQUEST['conf']) ?? $modx->getOption('contextFilter', $scriptProperties, $modx->context->key));
// Adding comma for retrieving events that are context-agnostic (ie have blank context).
$contextFilter = ",{$contextFilter}";
}
@@ -113,79 +116,98 @@
//++ Caching Options
$cacheEnable = $modx->getOption('cacheEnable',$scriptProperties,0);
$cacheLifetime = $modx->getOption('cacheLifetime',$scriptProperties,null); //3600 would be one hour - and overrides the resource lifetime; leaving null inherits the resource cache lifetime settings
-if (empty($cacheKey)) $cacheKey = $modx->getOption('cache_resource_key', null, 'resource');
-if (empty($cacheHandler)) $cacheHandler = $modx->getOption('cache_resource_handler', null, $modx->getOption(xPDO::OPT_CACHE_HANDLER, null, 'xPDOFileCache'));
-if (!isset($cacheExpires)) $cacheExpires = $cacheLifetime!==null ? (integer)$cacheLifetime : (integer) $modx->getOption('cache_resource_expires', null, $modx->getOption(xPDO::OPT_CACHE_EXPIRES, null, 0));
-if (empty($cacheElementKey)) $cacheElementKey = $modx->resource->getCacheKey() . '/' . md5($modx->toJSON($properties) . implode('', $modx->request->getParameters()));
+if (empty($cacheKey)) {
+ $cacheKey = $modx->getOption('cache_resource_key', null, 'resource');
+}
+if (empty($cacheHandler)) {
+ $cacheHandler = $modx->getOption('cache_resource_handler', null, $modx->getOption(xPDO::OPT_CACHE_HANDLER, null, 'xPDOFileCache'));
+}
+if (!isset($cacheExpires)) {
+ $cacheExpires = $cacheLifetime!==null ? (integer)$cacheLifetime : (integer) $modx->getOption('cache_resource_expires', null, $modx->getOption(xPDO::OPT_CACHE_EXPIRES, null, 0));
+}
+if (empty($cacheElementKey)) {
+ $cacheElementKey = $modx->resource->getCacheKey() . '/' . md5($modx->toJSON($properties) . implode('', $modx->request->getParameters()));
+}
$cacheOptions = array(xPDO::OPT_CACHE_KEY => $cacheKey,xPDO::OPT_CACHE_HANDLER => $cacheHandler,xPDO::OPT_CACHE_EXPIRES => $cacheExpires,);
$results = $modx->cacheManager->get($cacheElementKey, $cacheOptions);
-
+
//-- Update to the Timezone
- if(!empty($setTimezone)) $mxcal->setTimeZone($setTimezone,$debugTimezone);
+ if(!empty($setTimezone)) {
+ $mxcal->setTimeZone($setTimezone, $debugTimezone);
+ }
//-- Update to the Timezone: Manual fix to adjust timezone to match server settings examples.
//date_default_timezone_set("Europe/Amsterdam");
//date_default_timezone_set('America/New_York');
// Process any needed Feeds as setup in mxCalendar Manager
-
+
$feed = $modx->getObject('mxCalendarFeed', 10);
if($feed){
$feed->set('nextrunon', 0);
- $feed-save();
+ $feed->save();
}
$mxcal->processFeeds($setFeedTZ);
-if($modx->resource->get('id') != $ajaxResourceId && $modx->resource->get('id') != $ajaxMonthResourceId) {
+if((int)$modx->resource->get('id') !== (int)$ajaxResourceId && (int)$modx->resource->get('id') !== (int)$ajaxMonthResourceId) {
//-- Add mxCalendar Theme CSS to html header (set in snippit properties)
if($excludeCSS !== 1 && $excludeCSS !== '1'){
$modx->regClientCSS($modx->getOption('mxcalendars.assets_url',null,$modx->getOption('assets_url').'components/mxcalendars/').'themes/'.$theme.'/css/mxcalendar.css');
}
//-- Add the Shadowbox library info if we are using modal
- if(($modalView == 'true' || $modalView == 1) && ($usemxcLib == 'true' || $usemxcLib == 1)) {
+ if(($modalView === 'true' || (int)$modalView === 1) && ($usemxcLib === 'true' || (int)$usemxcLib === 1)) {
$mxcal->addShadowBox($modalSetWidth,$modalSetHeight);
} else { $mxcal->disableModal(); }
//-- Add mxCalendar jQuery Library if enabled
- if($addJQ && $addJQ !== 'false'){
+ if($addJQ && $addJQ !== 'false') {
$modx->regClientStartupScript($jqLibSrc);
- //-- Only add the required JS files we need
- if(!empty($ajaxResourceId) && $modx->resource->get('id') != $ajaxResourceId && $modx->resource->get('id') != $ajaxMonthResourceId)//-- Also requires a valid jQuery library be loaded
- $modx->regClientStartupScript($mxcal->config['assetsUrl'].'js/web/mxc-calendar.js');
+ //-- Only add the required JS files we need
+ if(!empty($ajaxResourceId)) { //-- Also requires a valid jQuery library be loaded
+ $modx->regClientStartupScript($mxcal->config['assetsUrl'] . 'js/web/mxc-calendar.js');
+ }
}
}
-if(((int)$cacheEnable === 1 || $cacheEnable === '1') && !empty($results) && $debug !== 1)
+if(((int)$cacheEnable === 1 || $cacheEnable === '1') && !empty($results) && (int)$debug !== 1) {
return $results;
-
-if($debug)
-var_dump($scriptProperties);
+}
+
+if($debug) {
+ var_dump($scriptProperties);
+}
$elStartDate = strtotime($eventListStartDate);
-if($elStartDate ===false){
- if($debug) echo 'Could not convert elStartDate value of "'.$elStartDate.'" to proper time stamp.elStartDate value of "'.$elStartDate.'" to proper time stamp.elEndDate value of "'.$elEndDate.'" to proper time stamp.elEndDate value of "'.$elEndDate.'" to proper time stamp.mxCalendar processed in $time seconds mxCalendar processed in $time seconds
';
- $gmapLocations = $mygeoloc->mapJSv3;
- } else {
- $googleMap = 'No class found.';
- }
- return $googleMap.'
+ return $chunk;
+ }
+
+ //@TODO remove; not used
+ public function parseChunk($name, $properties = [])
+ {
+ return $this->modx->getChunk($name, $properties);
+ }
+
+ public function getChunk($name, $properties = [])
+ {
+ $chunk = null;
+ if (!isset($this->chunks[$name])) {
+ $chunk = $this->_getTplChunk($name);
+ if (empty($chunk)) {
+ $chunk = $this->modx->getObject('modChunk', ['name' => $name]);
+ if ($chunk == false) {
+ return false;
+ }
+ }
+ $this->chunks[$name] = $chunk->getContent();
+ } else {
+ $o = $this->chunks[$name];
+ $chunk = $this->modx->newObject('modChunk');
+ $chunk->setContent($o);
+ }
+ $chunk->setCacheable(true);
+
+ return $chunk->process($properties);
+ }
+
+ private function _getTplChunk($name, $postfix = '.chunk.tpl')
+ {
+ $chunk = false;
+ $f = $this->config['chunksPath'] . strtolower($name) . $postfix;
+ if (file_exists($f)) {
+ $o = file_get_contents($f);
+ $chunk = $this->modx->newObject('modChunk');
+ $chunk->set('name', $name);
+ $chunk->setContent($o);
+ }
+
+ return $chunk;
+ }
+
+ private function _getMap(
+ $address = null,
+ $gmapRegion = '',
+ $width = '500px',
+ $height = '500px',
+ $gmapLib = 'http://maps.google.com/maps/api/js?sensor=false'
+ ) {
+ $googleMap = '';
+ $gmapLocations = '';
+ //-- Add google Map API
+ if ($address) {
+ include_once('google_geoloc.class.inc.php');
+ //-- Output the Address results
+ if (class_exists("geoLocator") && $address) {
+ //-- Split addresses for multiple points on the map
+ $addressList = explode('|', $address);
+
+ $mygeoloc = new geoLocator;
+ $mygeoloc->region = $gmapRegion;
+ //$mygeoloc->host = $this->config['GOOGLE_MAP_HOST'];
+ //$mygeoloc->apikey = $this->config['GOOGLE_MAP_KEY'];
+ //$mygeoloc->canvas = $this->config['mxcGoogleMapDisplayCanvasID'];
+ //$mygeoloc->autofitmap = (count($addressList) > 1 ? true : false);
+
+ foreach ($addressList as $loc) {
+ $mygeoloc->getGEO($loc);
+ }
+
+ $googleMap = '
';
+ $gmapLocations = $mygeoloc->mapJSv3;
+ } else {
+ $googleMap = 'No class found.';
+ }
+
+ return $googleMap . '
';
- }
}
-
- public function addShadowBox($initialWidth,$initialHeight){
- $shadowPath = $this->config['assetsUrl'].'js/web/shadowbox/sa/';
- $this->modx->regClientHTMLBlock('++ '.$el['title'].'++ ' . $el['title'] . '-- '.strftime('%m-%d', $iDay).' mxCalendar=>makeEventCalendar() processed in '.$time.'
';
-
- //-- Set additional day placeholders for month
- $phMonth = array(
- 'containerID'=>strftime('%a',$iDay)
- ,'containerClass'=>strftime('%a%Y',$iDay)
- ,'weeks'=>$heading.$weeks
- ,'headingLabel'=>$headingLabel
- ,'todayLink'=>$todayLink
- ,'todayLabel'=> $this->modx->lexicon('mxcalendars.label_today')
- ,'prevLink'=>$prevLink
- ,'nextLink'=>$nextLink
- );
- //return $chunkMonth->process($phMonth);
- return $this->getChunk($tpls->month, $phMonth);
- }
-
- public function makeCategoryList($labelCategory=null,$filteredCategoryId=null,$resourceId=null,$tpls=array()){
- $output = '';
- $tpls = (object)$tpls;
- // build category query
- $c = $this->modx->newQuery('mxCalendarCategories');
- $c->where(array(
- //'name:LIKE' => '%'.$query.'%',
- 'disable' => 0,
- 'active' => 1,
- ));
- $c->sortby('name','ASC');
- $mxcalendarsCats = $this->modx->getCollection('mxCalendarCategories', $c);
- // iterate
- // $list = array();
- // $output .= 'View All '.$mxc->get('name').' -- ' . strftime('%m-%d',
+ $iDay) . ' mxCalendar=>makeEventCalendar() processed in '.$time.'
';
+
+ //-- Set additional day placeholders for month
+ $phMonth = [
+ 'containerID' => strftime('%a', $iDay)
+ ,
+ 'containerClass' => strftime('%a%Y', $iDay)
+ ,
+ 'weeks' => $heading . $weeks
+ ,
+ 'headingLabel' => $headingLabel
+ ,
+ 'todayLink' => $todayLink
+ ,
+ 'todayLabel' => $this->modx->lexicon('mxcalendars.label_today')
+ ,
+ 'prevLink' => $prevLink
+ ,
+ 'nextLink' => $nextLink
+ ];
+
+ //return $chunkMonth->process($phMonth);
+ return $this->getChunk($tpls->month, $phMonth);
+ }
+
+ public function makeCategoryList($labelCategory = null, $filteredCategoryId = null, $resourceId = null, $tpls = [])
+ {
+ $output = '';
+ $tpls = (object)$tpls;
+ // build category query
+ $c = $this->modx->newQuery('mxCalendarCategories');
+ $c->where([
+ //'name:LIKE' => '%'.$query.'%',
+ 'disable' => 0,
+ 'active' => 1,
+ ]);
+ $c->sortby('name', 'ASC');
+ $mxcalendarsCats = $this->modx->getCollection('mxCalendarCategories', $c);
+ // iterate
+ // $list = array();
+ // $output .= 'View All '.$mxc->get('name').' CURRENT TIMEZONE: '.date_default_timezone_get().' NEW TIMEZONE: '.date_default_timezone_get().' '.print_r($vcalendar,true).' ';
+ //echo 'CURRENT TIMEZONE: '.date_default_timezone_get().' NEW TIMEZONE: '.date_default_timezone_get().' '.print_r($vcalendar,true).' ';
- //echo 'CURRENT TIMEZONE: '.date_default_timezone_get().' NEW TIMEZONE: '.date_default_timezone_get().' '.$hadmodifications.' event'.($hadmodifications > 1 ? 's' : '').' added/updated ['.$feed->get('feed').']');
} else {
- $this->logEvent('feed','Parsing feed #'.$feed->get('id').' had no changes. ['.$feed->get('feed').']');
+ // Create the newly found event from the feed
+ $event['categoryid'] = $feed->get('defaultcategoryid');
+ $feedEvent = $this->modx->newObject('mxCalendarEvents', $event);
+ $feedEvent->save();
+ if ($this->loggingEnabled) {
+ $this->logEvent('feed',
+ 'New Event (' . $feedEvent->get('id') . ') for feed #' . $feed->get('id') . '\n\nEvent JSON:\n' . json_encode($event));
+ }
+ $hadmodifications++;
}
-
+
+
+ }
+
+ // Set back current TIME ZONE
+ date_default_timezone_set($currentTZ);
+
+ //-- Update the feed next run time
+ $nextTime = strtotime('+' . $feed->get('timerint') . ' ' . $feed->get('timermeasurement'));
+ $feed->set('lastrunon', time());
+ $feed->set('nextrunon', $nextTime);
+ $feed->save();
+
+ if ($hadmodifications) {
+ $this->logEvent('feed',
+ 'Parsing feed #' . $feed->get('id') . ' had ' . $hadmodifications . ' event' . ($hadmodifications > 1 ? 's' : '') . ' added/updated [' . $feed->get('feed') . ']');
} else {
- //-- ==================== --//
- //-- Process the XML feed --//
- //-- ==================== --//
- $activeUrl = $feed->get('feed');
- $xmlEvents = file_get_contents($activeUrl);
+ $this->logEvent('feed',
+ 'Parsing feed #' . $feed->get('id') . ' had no changes. [' . $feed->get('feed') . ']');
+ }
+
+ } else {
+ //-- ==================== --//
+ //-- Process the XML feed --//
+ //-- ==================== --//
+ $activeUrl = $feed->get('feed');
+ $xmlEvents = file_get_contents($activeUrl);
+ if (!empty($xmlEvents)) {
$events = new SimpleXMLElement($xmlEvents);
$idx = 0;
foreach ($events->event as $event) {
- if(strtolower($event->timebegin) !== 'all day'){
- $startDateTime = strtotime($event->date.' '.$event->timebegin);
- $endDateTime = strtotime($event->date.' '.str_replace('- ', '', $event->timeend));
+ if (strtolower($event->timebegin) !== 'all day') {
+ $startDateTime = strtotime($event->date . ' ' . $event->timebegin);
+ $endDateTime = strtotime($event->date . ' ' . str_replace('- ', '', $event->timeend));
} else {
- $startDateTime = strtotime($event->date.' 00:00:00');
- $endDateTime = strtotime($event->date.' 23:59:59');
+ $startDateTime = strtotime($event->date . ' 00:00:00');
+ $endDateTime = strtotime($event->date . ' 23:59:59');
}
$lastchange = (!empty($event->lastedit) ? $event->lastedit : time());
// Output for testing
- $eventdata = array(
- 'title'=>$event->title,
- 'description'=>(!empty($event->description) ? $event->description : ''),
- 'location_name'=>(!empty($event->location) ? $event->location : ''),
- 'startdate'=>$startDateTime,
- 'enddate'=>$endDateTime,
- 'source'=>'feed',
- 'lastedit'=>$lastchange,
- 'feeds_id'=>$feed->get('id'),
- 'feeds_uid'=> (!empty($event->eventid) ? $event->eventid : ''),
- 'context'=>'',
- 'categoryid'=>$feed->get('defaultcategoryid'),
- 'createdon'=>(!empty($event->createDate) ? $event->createDate : time()),
- 'repeattype'=>0,
- 'repeaton'=>'',
- 'repeatfrequency'=>0
- );
+ $eventdata = [
+ 'title' => $event->title,
+ 'description' => (!empty($event->description) ? $event->description : ''),
+ 'location_name' => (!empty($event->location) ? $event->location : ''),
+ 'startdate' => $startDateTime,
+ 'enddate' => $endDateTime,
+ 'source' => 'feed',
+ 'lastedit' => $lastchange,
+ 'feeds_id' => $feed->get('id'),
+ 'feeds_uid' => (!empty($event->eventid) ? $event->eventid : ''),
+ 'context' => '',
+ 'categoryid' => $feed->get('defaultcategoryid'),
+ 'createdon' => (!empty($event->createDate) ? $event->createDate : time()),
+ 'repeattype' => 0,
+ 'repeaton' => '',
+ 'repeatfrequency' => 0
+ ];
//-- Save the new event
- if(!empty($event->eventid) && isset($event->eventid) ){
- $q = $this->modx->newQuery('mxCalendarEvents');
- $title = (string)$event->title;
- $feeduid = (string)$event->eventid;
- $q->where(array(
- 'mxCalendarEvents.title' => $title,
- 'mxCalendarEvents.feeds_id' => $feed->get('id'),
- 'mxCalendarEvents.feeds_uid' => $feeduid
- ));
- $q->prepare();
- //echo 'SQL ['.$event->title.' '.$event->eventid.']: '.$hadmodifications.' event'.($hadmodifications > 1 ? 's' : '').' added/updated ['.$feed->get('feed').']');
+ if ($hadmodifications) {
+ $this->logEvent('feed',
+ 'Parsing feed #' . $feed->get('id') . ' had ' . $hadmodifications . ' event' . ($hadmodifications > 1 ? 's' : '') . ' added/updated [' . $feed->get('feed') . ']');
} else {
- $this->logEvent('feed','Parsing feed #'.$feed->get('id').' had no changes. ['.$feed->get('feed').']');
+ $this->logEvent('feed',
+ 'Parsing feed #' . $feed->get('id') . ' had no changes. [' . $feed->get('feed') . ']');
}
-
}
}
-
-
- }
-
- public function logEvent($itemType='',$log=''){
- $mxclog = $this->modx->newObject('mxCalendarLog',array(
- 'itemtype' => $itemType,
- 'log' => $log,
- 'datetime' => time(),
- ));
- $mxclog->save();
}
+
+
+ }
+
+ public function logEvent($itemType = '', $log = '')
+ {
+ $mxclog = $this->modx->newObject('mxCalendarLog', [
+ 'itemtype' => $itemType,
+ 'log' => $log,
+ 'datetime' => time(),
+ ]);
+ $mxclog->save();
+ }
}
/**
* Class to help with tracking processing times
- *
+ *
*/
-class makeProcessTime {
+class makeProcessTime
+{
public $globalStartProcess, $startProcess, $endProcess, $debug;
- public function __construct($gsProc=null,$debug){
+
+ public function __construct($gsProc = null, $debug)
+ {
$this->debug = !empty($debug) ? $debug : 0;
$now = microtime(true);
- if(!empty($gsProc)){
- self::set('globalStartProcess',$gsProc);
+ if (!empty($gsProc)) {
+ $this->set('globalStartProcess', $gsProc);
}
- self::set('startProcess',$now);
-
+ $this->set('startProcess', $now);
+
}
- public function set($property='',$val=null){
- if(!empty($property)){
+
+ public function set($property = '', $val = null)
+ {
+ if (!empty($property)) {
$this->{$property} = $val;
}
}
- public function get($property=''){
- if(!empty($property)){
+
+ public function get($property = '')
+ {
+ if (!empty($property)) {
return $this->{$property};
}
+
return false;
}
- public function getTime(){
+
+ public function getTime()
+ {
return $this->endProcess - $this->startProcess;
}
- public function end($echoMessage=''){
- self::set('endProcess',microtime(true));
- if(!empty($echoMessage) && $this->debug){
- if(!empty($this->globalStartProcess))
- echo $echoMessage.' started @'.($this->startProcess - $this->globalStartProcess).' and ended @'.($this->endProcess - $this->globalStartProcess).' for total processing time of '.self::getTime().' seconds'.self::getTime().' seconds' . $this->getTime() . ' seconds' . $this->getTime() . ' seconds
';
- $gmapLocations = $mygeoloc->mapJSv3;
- } else {
- $googleMap = 'No class found.';
- }
- return $googleMap.'
+ return $chunk;
+ }
+
+ //@TODO remove; not used
+ public function parseChunk($name, $properties = [])
+ {
+ return $this->modx->getChunk($name, $properties);
+ }
+
+ public function getChunk($name, $properties = [])
+ {
+ $chunk = null;
+ if (!isset($this->chunks[$name])) {
+ $chunk = $this->_getTplChunk($name);
+ if (empty($chunk)) {
+ $chunk = $this->modx->getObject('modChunk', ['name' => $name]);
+ if ($chunk == false) {
+ return false;
+ }
+ }
+ $this->chunks[$name] = $chunk->getContent();
+ } else {
+ $o = $this->chunks[$name];
+ $chunk = $this->modx->newObject('modChunk');
+ $chunk->setContent($o);
+ }
+ $chunk->setCacheable(true);
+
+ return $chunk->process($properties);
+ }
+
+ private function _getTplChunk($name, $postfix = '.chunk.tpl')
+ {
+ $chunk = false;
+ $f = $this->config['chunksPath'] . strtolower($name) . $postfix;
+ if (file_exists($f)) {
+ $o = file_get_contents($f);
+ $chunk = $this->modx->newObject('modChunk');
+ $chunk->set('name', $name);
+ $chunk->setContent($o);
+ }
+
+ return $chunk;
+ }
+
+ private function _getMap(
+ $address = null,
+ $gmapRegion = '',
+ $width = '500px',
+ $height = '500px',
+ $gmapLib = 'http://maps.google.com/maps/api/js?sensor=false'
+ ) {
+ $googleMap = '';
+ $gmapLocations = '';
+ //-- Add google Map API
+ if ($address) {
+ include_once('google_geoloc.class.inc');
+ //-- Output the Address results
+ if (class_exists("geoLocator") && $address) {
+ //-- Split addresses for multiple points on the map
+ $addressList = explode('|', $address);
+
+ $mygeoloc = new geoLocator;
+ $mygeoloc->region = $gmapRegion;
+ //$mygeoloc->host = $this->config['GOOGLE_MAP_HOST'];
+ //$mygeoloc->apikey = $this->config['GOOGLE_MAP_KEY'];
+ //$mygeoloc->canvas = $this->config['mxcGoogleMapDisplayCanvasID'];
+ //$mygeoloc->autofitmap = (count($addressList) > 1 ? true : false);
+
+ foreach ($addressList as $loc) {
+ $mygeoloc->getGEO($loc);
+ }
+
+ $googleMap = '
';
+ $gmapLocations = $mygeoloc->mapJSv3;
+ } else {
+ $googleMap = 'No class found.';
+ }
+
+ return $googleMap . '
';
- }
}
-
- public function addShadowBox($initialWidth,$initialHeight){
- $shadowPath = $this->config['assetsUrl'].'js/web/shadowbox/sa/';
- $this->modx->regClientHTMLBlock('++ '.$el['title'].'++ ' . $el['title'] . '-- '.strftime('%m-%d', $iDay).' mxCalendar=>makeEventCalendar() processed in '.$time.'
';
-
- //-- Set additional day placeholders for month
- $phMonth = array(
- 'containerID'=>strftime('%a',$iDay)
- ,'containerClass'=>strftime('%a%Y',$iDay)
- ,'weeks'=>$heading.$weeks
- ,'headingLabel'=>$headingLabel
- ,'todayLink'=>$todayLink
- ,'todayLabel'=> $this->modx->lexicon('mxcalendars.label_today')
- ,'prevLink'=>$prevLink
- ,'nextLink'=>$nextLink
- );
- //return $chunkMonth->process($phMonth);
- return $this->getChunk($tpls->month, $phMonth);
- }
-
- public function makeCategoryList($labelCategory=null,$filteredCategoryId=null,$resourceId=null,$tpls=array()){
- $output = '';
- $tpls = (object)$tpls;
- // build category query
- $c = $this->modx->newQuery('mxCalendarCategories');
- $c->where(array(
- //'name:LIKE' => '%'.$query.'%',
- 'disable' => 0,
- 'active' => 1,
- ));
- $c->sortby('name','ASC');
- $mxcalendarsCats = $this->modx->getCollection('mxCalendarCategories', $c);
- // iterate
- // $list = array();
- // $output .= 'View All '.$mxc->get('name').' -- ' . strftime('%m-%d',
+ $iDay) . ' mxCalendar=>makeEventCalendar() processed in '.$time.'
';
+
+ //-- Set additional day placeholders for month
+ $phMonth = [
+ 'containerID' => strftime('%a', $iDay)
+ ,
+ 'containerClass' => strftime('%a%Y', $iDay)
+ ,
+ 'weeks' => $heading . $weeks
+ ,
+ 'headingLabel' => $headingLabel
+ ,
+ 'todayLink' => $todayLink
+ ,
+ 'todayLabel' => $this->modx->lexicon('mxcalendars.label_today')
+ ,
+ 'prevLink' => $prevLink
+ ,
+ 'nextLink' => $nextLink
+ ];
+
+ //return $chunkMonth->process($phMonth);
+ return $this->getChunk($tpls->month, $phMonth);
+ }
+
+ public function makeCategoryList($labelCategory = null, $filteredCategoryId = null, $resourceId = null, $tpls = [])
+ {
+ $output = '';
+ $tpls = (object)$tpls;
+ // build category query
+ $c = $this->modx->newQuery('mxCalendarCategories');
+ $c->where([
+ //'name:LIKE' => '%'.$query.'%',
+ 'disable' => 0,
+ 'active' => 1,
+ ]);
+ $c->sortby('name', 'ASC');
+ $mxcalendarsCats = $this->modx->getCollection('mxCalendarCategories', $c);
+ // iterate
+ // $list = array();
+ // $output .= 'View All '.$mxc->get('name').' CURRENT TIMEZONE: '.date_default_timezone_get().' NEW TIMEZONE: '.date_default_timezone_get().' '.print_r($vcalendar,true).' ';
+ //echo 'CURRENT TIMEZONE: '.date_default_timezone_get().' NEW TIMEZONE: '.date_default_timezone_get().' '.print_r($vcalendar,true).' ';
- //echo 'CURRENT TIMEZONE: '.date_default_timezone_get().' NEW TIMEZONE: '.date_default_timezone_get().' '.$hadmodifications.' event'.($hadmodifications > 1 ? 's' : '').' added/updated ['.$feed->get('feed').']');
} else {
- $this->logEvent('feed','Parsing feed #'.$feed->get('id').' had no changes. ['.$feed->get('feed').']');
+ // Create the newly found event from the feed
+ $event['categoryid'] = $feed->get('defaultcategoryid');
+ $feedEvent = $this->modx->newObject('mxCalendarEvents', $event);
+ $feedEvent->save();
+ if ($this->loggingEnabled) {
+ $this->logEvent('feed',
+ 'New Event (' . $feedEvent->get('id') . ') for feed #' . $feed->get('id') . '\n\nEvent JSON:\n' . json_encode($event));
+ }
+ $hadmodifications++;
}
-
+
+
+ }
+
+ // Set back current TIME ZONE
+ date_default_timezone_set($currentTZ);
+
+ //-- Update the feed next run time
+ $nextTime = strtotime('+' . $feed->get('timerint') . ' ' . $feed->get('timermeasurement'));
+ $feed->set('lastrunon', time());
+ $feed->set('nextrunon', $nextTime);
+ $feed->save();
+
+ if ($hadmodifications) {
+ $this->logEvent('feed',
+ 'Parsing feed #' . $feed->get('id') . ' had ' . $hadmodifications . ' event' . ($hadmodifications > 1 ? 's' : '') . ' added/updated [' . $feed->get('feed') . ']');
} else {
- //-- ==================== --//
- //-- Process the XML feed --//
- //-- ==================== --//
- $activeUrl = $feed->get('feed');
- $xmlEvents = file_get_contents($activeUrl);
+ $this->logEvent('feed',
+ 'Parsing feed #' . $feed->get('id') . ' had no changes. [' . $feed->get('feed') . ']');
+ }
+
+ } else {
+ //-- ==================== --//
+ //-- Process the XML feed --//
+ //-- ==================== --//
+ $activeUrl = $feed->get('feed');
+ $xmlEvents = file_get_contents($activeUrl);
+ if (!empty($xmlEvents)) {
$events = new SimpleXMLElement($xmlEvents);
$idx = 0;
foreach ($events->event as $event) {
- if(strtolower($event->timebegin) !== 'all day'){
- $startDateTime = strtotime($event->date.' '.$event->timebegin);
- $endDateTime = strtotime($event->date.' '.str_replace('- ', '', $event->timeend));
+ if (strtolower($event->timebegin) !== 'all day') {
+ $startDateTime = strtotime($event->date . ' ' . $event->timebegin);
+ $endDateTime = strtotime($event->date . ' ' . str_replace('- ', '', $event->timeend));
} else {
- $startDateTime = strtotime($event->date.' 00:00:00');
- $endDateTime = strtotime($event->date.' 23:59:59');
+ $startDateTime = strtotime($event->date . ' 00:00:00');
+ $endDateTime = strtotime($event->date . ' 23:59:59');
}
$lastchange = (!empty($event->lastedit) ? $event->lastedit : time());
// Output for testing
- $eventdata = array(
- 'title'=>$event->title,
- 'description'=>(!empty($event->description) ? $event->description : ''),
- 'location_name'=>(!empty($event->location) ? $event->location : ''),
- 'startdate'=>$startDateTime,
- 'enddate'=>$endDateTime,
- 'source'=>'feed',
- 'lastedit'=>$lastchange,
- 'feeds_id'=>$feed->get('id'),
- 'feeds_uid'=> (!empty($event->eventid) ? $event->eventid : ''),
- 'context'=>'',
- 'categoryid'=>$feed->get('defaultcategoryid'),
- 'createdon'=>(!empty($event->createDate) ? $event->createDate : time()),
- 'repeattype'=>0,
- 'repeaton'=>'',
- 'repeatfrequency'=>0
- );
+ $eventdata = [
+ 'title' => $event->title,
+ 'description' => (!empty($event->description) ? $event->description : ''),
+ 'location_name' => (!empty($event->location) ? $event->location : ''),
+ 'startdate' => $startDateTime,
+ 'enddate' => $endDateTime,
+ 'source' => 'feed',
+ 'lastedit' => $lastchange,
+ 'feeds_id' => $feed->get('id'),
+ 'feeds_uid' => (!empty($event->eventid) ? $event->eventid : ''),
+ 'context' => '',
+ 'categoryid' => $feed->get('defaultcategoryid'),
+ 'createdon' => (!empty($event->createDate) ? $event->createDate : time()),
+ 'repeattype' => 0,
+ 'repeaton' => '',
+ 'repeatfrequency' => 0
+ ];
//-- Save the new event
- if(!empty($event->eventid) && isset($event->eventid) ){
- $q = $this->modx->newQuery('mxCalendarEvents');
- $title = (string)$event->title;
- $feeduid = (string)$event->eventid;
- $q->where(array(
- 'mxCalendarEvents.title' => $title,
- 'mxCalendarEvents.feeds_id' => $feed->get('id'),
- 'mxCalendarEvents.feeds_uid' => $feeduid
- ));
- $q->prepare();
- //echo 'SQL ['.$event->title.' '.$event->eventid.']: '.$hadmodifications.' event'.($hadmodifications > 1 ? 's' : '').' added/updated ['.$feed->get('feed').']');
+ if ($hadmodifications) {
+ $this->logEvent('feed',
+ 'Parsing feed #' . $feed->get('id') . ' had ' . $hadmodifications . ' event' . ($hadmodifications > 1 ? 's' : '') . ' added/updated [' . $feed->get('feed') . ']');
} else {
- $this->logEvent('feed','Parsing feed #'.$feed->get('id').' had no changes. ['.$feed->get('feed').']');
+ $this->logEvent('feed',
+ 'Parsing feed #' . $feed->get('id') . ' had no changes. [' . $feed->get('feed') . ']');
}
-
}
+
}
-
-
- }
-
- public function logEvent($itemType='',$log=''){
- $mxclog = $this->modx->newObject('mxCalendarLog',array(
- 'itemtype' => $itemType,
- 'log' => $log,
- 'datetime' => time(),
- ));
- $mxclog->save();
}
+
+
+ }
+
+ public function logEvent($itemType = '', $log = '')
+ {
+ $mxclog = $this->modx->newObject('mxCalendarLog', [
+ 'itemtype' => $itemType,
+ 'log' => $log,
+ 'datetime' => time(),
+ ]);
+ $mxclog->save();
+ }
}
/**
* Class to help with tracking processing times
- *
+ *
*/
-class makeProcessTime {
+class makeProcessTime
+{
public $globalStartProcess, $startProcess, $endProcess, $debug;
- public function __construct($gsProc=null,$debug){
+
+ public function __construct($debug, $gsProc = null)
+ {
$this->debug = !empty($debug) ? $debug : 0;
$now = microtime(true);
- if(!empty($gsProc)){
- self::set('globalStartProcess',$gsProc);
+ if (!empty($gsProc)) {
+ $this->set('globalStartProcess', $gsProc);
}
- self::set('startProcess',$now);
-
+ $this->set('startProcess', $now);
+
}
- public function set($property='',$val=null){
- if(!empty($property)){
+
+ public function set($property = '', $val = null)
+ {
+ if (!empty($property)) {
$this->{$property} = $val;
}
}
- public function get($property=''){
- if(!empty($property)){
+
+ public function get($property = '')
+ {
+ if (!empty($property)) {
return $this->{$property};
}
+
return false;
}
- public function getTime(){
+
+ public function getTime()
+ {
return $this->endProcess - $this->startProcess;
}
- public function end($echoMessage=''){
- self::set('endProcess',microtime(true));
- if(!empty($echoMessage) && $this->debug){
- if(!empty($this->globalStartProcess))
- echo $echoMessage.' started @'.($this->startProcess - $this->globalStartProcess).' and ended @'.($this->endProcess - $this->globalStartProcess).' for total processing time of '.self::getTime().' seconds'.self::getTime().' seconds' . $this->getTime() . ' seconds' . $this->getTime() . ' secondsStart date MONDAY of that week: : '.$startDate.'Next Valid Repeat Week Start Date: : '.$startDate.'Start date MONDAY of that week: : ' . $startDate . 'Next Valid Repeat Week Start Date: : ' . $startDate . ''.count($ar_Recur).' total matches dates added. ' . count($ar_Recur) . ' total matches dates added.
{$onRichTextEditorInit}
\ No newline at end of file
'
- ,border: false
- ,cls: 'modx-page-header'
- },{
- xtype: 'modx-tabs'
- ,bodyStyle: 'padding: 10px'
- ,defaults: { border: false,autoHeight: true }
- ,border: true
- ,items: [{
- //-- Events Tab
- title: _('mxcalendars.tab_events')
- ,defaults: { autoHeight: true }
- ,items: [
- // ADD DESCRIPTION INFORMATION
- {
- html: '