extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-15 10:28:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Get planner by category working again

Browse Source 
Categories were missing due to change in how static categories are done.  This should be changed to use promises, when we get here.
This commit is contained in:
nathan 2023-03-15 12:02:11 -06:00
parent ae5701cb01
commit 73b4f9ee43
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
calendar/js/et2_widget_planner.ts
View File

@ -34,10 +34,10 @@ import {et2_no_init} from "../../api/js/etemplate/et2_core_common";
import {CalendarApp} from "./app"; import {CalendarApp} from "./app";
import {sprintf} from "../../api/js/egw_action/egw_action_common.js"; import {sprintf} from "../../api/js/egw_action/egw_action_common.js";
import {et2_dataview_grid} from "../../api/js/etemplate/et2_dataview_view_grid"; import {et2_dataview_grid} from "../../api/js/etemplate/et2_dataview_view_grid";
import {et2_selectbox} from "../../api/js/etemplate/et2_widget_selectbox";
import {formatDate, formatTime} from "../../api/js/etemplate/Et2Date/Et2Date"; import {formatDate, formatTime} from "../../api/js/etemplate/Et2Date/Et2Date";
import interact from "@interactjs/interactjs/index"; import interact from "@interactjs/interactjs/index";
import type {InteractEvent} from "@interactjs/core/InteractEvent"; import type {InteractEvent} from "@interactjs/core/InteractEvent";
import {StaticOptions} from "../../api/js/etemplate/Et2Select/StaticOptions";
/** /**
* Class which implements the "calendar-planner" XET-Tag for displaying a longer * Class which implements the "calendar-planner" XET-Tag for displaying a longer
@ -707,12 +707,11 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta
this.grid.append(hours); this.grid.append(hours);
} }
}, },
row_labels: function() { row_labels: function()
{
var im = this.getInstanceManager(); var im = this.getInstanceManager();
var categories = et2_selectbox.cat_options({ this.nodeName = "ET2-SELECT-CAT_RO"
_type:'select-cat', var categories = StaticOptions.cached_server_side(this, "cat", ',,,calendar', false);
getInstanceManager: function() {return im;}
},{application: 'calendar'});
var labels = []; var labels = [];
let app_calendar = this.getInstanceManager().app_obj.calendar || app.calendar; let app_calendar = this.getInstanceManager().app_obj.calendar || app.calendar;
@ -722,7 +721,7 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta
) )
{ {
app_calendar.state.cat_id = ''; app_calendar.state.cat_id = '';
labels.push({id:'',value:'',label: egw.lang('none'), main: '', data: {}}); labels.push({id: '', value: '', label: egw.lang('none'), main: '', data: {}});
labels = labels.concat(categories); labels = labels.concat(categories);
} }
else else
@ -1958,10 +1957,8 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta
if(event && event.data && event.data.app && this.options.group_by == 'category') if(event && event.data && event.data.app && this.options.group_by == 'category')
{ {
// Fake it to use the cache / call // Fake it to use the cache / call
et2_selectbox.cat_options({ this.nodeName = "ET2-SELECT-CAT_RO"
_type:'select-cat', let categories = StaticOptions.cached_server_side(this, "cat", ",,," + (event.data.app || 'calendar'), false);
getInstanceManager: function() {return im;}
}, {application:event.data.app||'calendar'});
} }
} }