Settings widget for sync is functional now

js/settings/SettingsCalSyncWidget.js

@@ -27,6 +27,7 @@ Zarafa.plugins.calendarimporter.settings.SettingsCalSyncWidget = Ext.extend(Zara
 				{ name : 'pass' },
 				{ name : 'intervall', type : 'int' },
 				{ name : 'calendar' },
+                { name : 'calendarname' },
 				{ name : 'lastsync' }
 			],
 			sortInfo : {
@@ -68,7 +69,9 @@ Zarafa.plugins.calendarimporter.settings.SettingsCalSyncWidget = Ext.extend(Zara
 		var icslinks = settingsModel.get('zarafa/v1/contexts/calendar/icssync', true);
 		var syncArray = [];
 		for (var key in icslinks) {
-			syncArray.push(Ext.apply({}, icslinks[key], { id : key }));
+			if(icslinks.hasOwnProperty(key)) { // skip inherited props
+				syncArray.push(Ext.apply({}, icslinks[key], {id: key}));
+			}
 		}
 
 		// Load all icslinks into the GridPanel
@@ -98,7 +101,8 @@ Zarafa.plugins.calendarimporter.settings.SettingsCalSyncWidget = Ext.extend(Zara
 				'user' : icslink.get('user'),
 				'pass' : icslink.get('pass'),
 				'lastsync' : icslink.get('lastsync'),
-				'calendar' : icslink.get('calendar')
+				'calendar' : icslink.get('calendar'),
+                'calendarname' : Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(icslink.get('calendar')).display_name
 			};
 		}
 		settingsModel.set('zarafa/v1/contexts/calendar/icssync', icslinkData);

js/settings/SettingsWidget.js

@@ -88,7 +88,7 @@ Zarafa.plugins.calendarimporter.settings.SettingsWidget = Ext.extend(Zarafa.sett
 	 */
 	update : function(settingsModel) {
 		this.enableSync.setValue(settingsModel.get(this.enableSync.name));
-		this.defaultCalendar.setValue(settingsModel.get(this.defaultCalendar.name));
+		this.defaultCalendar.setValue(Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByName(settingsModel.get(this.defaultCalendar.name)).entryid);
 		this.defaultTimezone.setValue(settingsModel.get(this.defaultTimezone.name));
 	},
 
@@ -104,7 +104,7 @@ Zarafa.plugins.calendarimporter.settings.SettingsWidget = Ext.extend(Zarafa.sett
 
         if(settingsModel.get(this.enableSync.name) != this.enableSync.getValue()) {
             changed = true;
-        } else if(settingsModel.get(this.defaultCalendar.name) != this.defaultCalendar.getValue()) {
+        } else if(settingsModel.get(this.defaultCalendar.name) != Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(this.defaultCalendar.getValue()).display_name) {
             changed = true;
         } else if(settingsModel.get(this.defaultTimezone.name) != this.defaultTimezone.getValue()) {
             changed = true;
@@ -113,7 +113,7 @@ Zarafa.plugins.calendarimporter.settings.SettingsWidget = Ext.extend(Zarafa.sett
         if(changed) {
             // Really save changes
             settingsModel.set(this.enableSync.name, this.enableSync.getValue());
-            settingsModel.set(this.defaultCalendar.name, this.defaultCalendar.getValue());
+            settingsModel.set(this.defaultCalendar.name, Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(this.defaultCalendar.getValue()).display_name); // store name
             settingsModel.set(this.defaultTimezone.name, this.defaultTimezone.getValue());
 
             this.onUpdateSettings();

js/settings/dialogs/CalSyncEditContentPanel.js

@@ -23,7 +23,7 @@ Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditContentPanel = Ext.e
 			model : true,
 			autoSave : false,
 			width : 400,
-			height : 350,
+			height : 400,
 			title : _('ICAL Sync'),
 			items : [{
 				xtype : 'calendarimporter.calsynceditpanel',

js/settings/dialogs/CalSyncEditPanel.js

@@ -59,8 +59,7 @@ Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditPanel = Ext.extend(E
 		var store = this.dialog.store;
 		var id = 0;
 		var record = undefined;
-		
-		console.log(this);
+
 		if(!this.currentItem) {
 			record = new store.recordType({
 				id: this.hashCode(this.icsurl.getValue()),
@@ -69,6 +68,7 @@ Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditPanel = Ext.extend(E
 				user: this.user.getValue(),
 				pass: Ext.util.base64.encode(this.pass.getValue()),
 				calendar: this.calendar.getValue(),
+                calendarname : Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(this.calendar.getValue()).display_name,
 				lastsync: "never"
 			});
 		}
@@ -82,6 +82,7 @@ Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditPanel = Ext.extend(E
 				this.currentItem.set('user', this.user.getValue());
 				this.currentItem.set('pass', Ext.util.base64.encode(this.pass.getValue()));
 				this.currentItem.set('calendar', this.calendar.getValue());
+                this.currentItem.set('calendarname', Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(this.calendar.getValue()).display_name);
 			}
 			this.dialog.close();
 		}
@@ -95,48 +96,20 @@ Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditPanel = Ext.extend(E
 	createPanelItems : function(config)
 	{
 		var icsurl = "";
-		var intervall = "";
+		var intervall = "15";
 		var user = "";
 		var pass = "";
-		var calendar = "";
-		
-		var defaultFolder = container.getHierarchyStore().getDefaultFolder('calendar'); // @type: Zarafa.hierarchy.data.MAPIFolderRecord		
-		var subFolders = defaultFolder.getChildren();
-		var myStore = [];
-		
-		if(config.item){
+        var calendarname = "";
+		var calendar = Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByName(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/default_calendar")).entryid;
+        var myStore = Zarafa.plugins.calendarimporter.data.Actions.getAllCalendarFolders(true);
+
+        if(config.item){
 			icsurl = config.item.get('icsurl');
 			intervall = config.item.get('intervall');
 			user = config.item.get('user');
 			pass = Ext.util.base64.decode(config.item.get('pass'));
 			calendar = config.item.get('calendar');
-		}
-		
-		/* add all local calendar folders */
-		var i = 0;
-		myStore.push(new Array(defaultFolder.getDefaultFolderKey(), defaultFolder.getDisplayName()));
-		for(i = 0; i < subFolders.length; i++) {
-			/* Store all subfolders */
-			myStore.push(new Array(subFolders[i].getDisplayName(), subFolders[i].getDisplayName(), false)); // 3rd field = isPublicfolder
-		}
-		
-		/* add all shared calendar folders */
-		var pubStore = container.getHierarchyStore().getPublicStore();
-		
-		if(typeof pubStore !== "undefined") {
-			try {
-				var pubFolder = pubStore.getDefaultFolder("publicfolders");
-				var pubSubFolders = pubFolder.getChildren();
-				
-				for(i = 0; i < pubSubFolders.length; i++) {
-					if(pubSubFolders[i].isContainerClass("IPF.Appointment")){
-						myStore.push(new Array(pubSubFolders[i].getDisplayName(), pubSubFolders[i].getDisplayName() + " [Shared]", true)); // 3rd field = isPublicfolder
-					}
-				}
-			} catch (e) {
-				console.log("Error opening the shared folder...");
-				console.log(e);
-			}
+            calendarname = config.item.get('calendarname');
 		}
 		
 				

js/settings/ui/CalSyncGrid.js

@@ -58,6 +58,16 @@ Zarafa.plugins.calendarimporter.settings.ui.CalSyncGrid = Ext.extend(Ext.grid.Gr
 		return value ? "true" : "false";
 	},
 
+	/**
+	 * Render function
+	 * @return {String}
+	 * @private
+	 */
+	renderCalendarColumn : function(value, p, record)
+	{
+		return Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(value).display_name;
+	},
+
 	/**
 	 * Creates a column model object, used in {@link #colModel} config
 	 * @return {Ext.grid.ColumnModel} column model object
@@ -71,7 +81,7 @@ Zarafa.plugins.calendarimporter.settings.ui.CalSyncGrid = Ext.extend(Ext.grid.Gr
 			renderer : Zarafa.common.ui.grid.Renderers.text
 		},
 		{
-			dataIndex : 'calendar',
+			dataIndex : 'calendarname',
 			header : _('Destination Calender'),
 			renderer : Zarafa.common.ui.grid.Renderers.text
 		},