LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Improve events display with many categories

pull/207/head
Francis Lachapelle 2016-05-09 15:51:54 -04:00
parent 9ad983e0cb
commit 6aae6357c4
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
View File

@ -46,7 +46,13 @@
</md-input-container>
<!-- categories -->
<md-chips ng-model="editor.component.categories">
<md-autocomplete
<md-chip-template>
<span class="sg-chip-color">
<span ng-style="{ 'background-color': editor.component.constructor.$categories[$chip] }"><!-- color --></span>
</span>
<span>{{$chip}}</span>
</md-chip-template>
<md-autocomplete
md-selected-item="editor.categories.selected"
md-search-text="editor.categories.searchText"
md-items="category in editor.component.constructor.filterCategories(editor.categories.searchText)"

20
UI/WebServerResources/js/Scheduler/Component.service.js
View File

@ -285,17 +285,22 @@
deferred = Component.$q.defer();
params = { view: view.toLowerCase(), sd: startDate.getDayString(), ed: endDate.getDayString() };
Component.$log.debug('eventsblocks ' + JSON.stringify(params, undefined, 2));
futureComponentData = this.$$resource.fetch(null, 'eventsblocks', params);
futureComponentData.then(function(views) {
var reduceComponent, associateComponent;
reduceComponent = function(objects, eventData, i) {
var componentData = _.zipObject(this.eventsFields, eventData),
start = new Date(componentData.c_startdate * 1000);
start = new Date(componentData.c_startdate * 1000),
component;
componentData.hour = start.getHourString();
componentData.blocks = [];
objects.push(new Component(componentData));
component = new Component(componentData);
// Filter out categories for which there's no associated color
component.categories = _.filter(component.categories, function(name) {
return Component.$Preferences.defaults.SOGoCalendarCategoriesColors[name];
});
objects.push(component);
return objects;
};
@ -402,8 +407,13 @@
// Instanciate Component objects
_.reduce(data[type], function(components, componentData, i) {
var data = _.zipObject(fields, componentData);
components.push(new Component(data));
var data = _.zipObject(fields, componentData), component;
component = new Component(data);
// Filter out categories for which there's no associated color
component.categories = _.filter(component.categories, function(name) {
return Component.$Preferences.defaults.SOGoCalendarCategoriesColors[name];
});
components.push(component);
return components;
}, components);