Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import $ from '@js/core/renderer';
import {
APPOINTMENT_CONTENT_CLASSES,
} from '../../classes';
import { Appointment } from './m_appointment';
import { Appointment } from './appointment';

export class AgendaAppointment extends Appointment {
get coloredElement(): dxElementWrapper {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ import {
REDUCED_APPOINTMENT_ICON,
REDUCED_APPOINTMENT_PARTS_CLASSES,
} from '../../classes';
import type { SubscribeKey, SubscribeMethods } from '../../m_subscribes';
import { validateRRule } from '../../recurrence/validate_rule';
import type { SubscribeKey, SubscribeMethods } from '../../subscribes';
import type { SafeAppointment } from '../../types';
import type { AppointmentDataAccessor } from '../../utils/data_accessor/appointment_data_accessor';
import type { AppointmentProperties, AppointmentReducedPart } from './m_types';
import {
getAriaDescription,
getAriaLabel,
getReducedIconTooltip,
} from './text_utils';
import type { AppointmentProperties, AppointmentReducedPart } from './types';

const DEFAULT_HORIZONTAL_HANDLES = 'left right';
const DEFAULT_VERTICAL_HANDLES = 'top bottom';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import messageLocalization from '@js/common/core/localization/message';
import { isDefined } from '@js/core/utils/type';

import { formatImplicitSchedulerDate, formatImplicitSchedulerTime } from '../../utils/global_formats';
import type { AppointmentProperties } from './m_types';
import type { AppointmentProperties } from './types';

const localizeDate = (date: Date): string => formatImplicitSchedulerDate(date);
const localizeTime = (date: Date): string => formatImplicitSchedulerTime(date);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { SafeAppointment } from '@ts/scheduler/types';
import type { AppointmentDataAccessor } from '@ts/scheduler/utils/data_accessor/appointment_data_accessor';
import type { ResourceManager } from '@ts/scheduler/utils/resource_manager/resource_manager';

import type { Appointment } from './m_appointment';
import type { Appointment } from './appointment';

export type AppointmentReducedPart = 'head' | 'body' | 'tail';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import {
APPOINTMENT_ITEM_CLASS,
} from '../classes';
import { APPOINTMENT_SETTINGS_KEY } from '../constants';
import type { SubscribeKey, SubscribeMethods } from '../m_subscribes';
import type { TimeZoneCalculator } from '../r1/timezone_calculator/index';
import type { SubscribeKey, SubscribeMethods } from '../subscribes';
import type { DesktopTooltipStrategy } from '../tooltip_strategies/desktop_tooltip_strategy';
import type { MobileTooltipStrategy } from '../tooltip_strategies/mobile_tooltip_strategy';
import type {
Expand All @@ -59,7 +59,7 @@ import { getAppointmentGroupValues } from '../utils/resource_manager/appointment
import { getGroupTexts } from '../utils/resource_manager/group_utils';
import type { ResourceManager } from '../utils/resource_manager/resource_manager';
import timeZoneUtils from '../utils_time_zone';
import type { AppointmentDataSource } from '../view_model/m_appointment_data_source';
import type { AppointmentDataSource } from '../view_model/appointment_data_source';
import type {
AppointmentAgendaViewModel,
AppointmentCollectorViewModel,
Expand All @@ -69,11 +69,11 @@ import type {
} from '../view_model/types';
import type ViewDataProvider from '../workspaces/view_model/view_data_provider';
import { AgendaAppointment } from './appointment/agenda_appointment';
import { Appointment } from './appointment/m_appointment';
import type { AppointmentProperties } from './appointment/m_types';
import { createAgendaAppointmentLayout, createAppointmentLayout } from './m_appointment_layout';
import { AppointmentsKeyboardNavigation } from './m_appointments_kbn';
import { getAppointmentDateRange } from './resizing/m_core';
import { Appointment } from './appointment/appointment';
import type { AppointmentProperties } from './appointment/types';
import { createAgendaAppointmentLayout, createAppointmentLayout } from './appointment_layout';
import { AppointmentsKeyboardNavigation } from './appointments_kbn';
import { getAppointmentDateRange } from './resizing/core';
import type { DateRange } from './resizing/types';
import { isNeedToAdd } from './utils/get_arrays_diff';
import { getViewModelDiff } from './utils/get_view_model_diff';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import eventsEngine from '@ts/events/core/events_engine';
import { isFocusLost } from '../utils/is_focus_lost';
import { getRawAppointmentGroupValues } from '../utils/resource_manager/appointment_groups_utils';
import type { SortedEntity } from '../view_model/types';
import type SchedulerAppointments from './m_appointment_collection';
import type SchedulerAppointments from './appointment_collection';

export class AppointmentsKeyboardNavigation {
private readonly _collection: SchedulerAppointments;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { equalByValue } from '@js/core/utils/common';

import type { SafeAppointment } from '../../types';
import type { AppointmentDataSource } from '../../view_model/m_appointment_data_source';
import type { AppointmentDataSource } from '../../view_model/appointment_data_source';
import type { AppointmentViewModelPlain } from '../../view_model/types';
import type { DiffItem } from './get_arrays_diff';
import { getArraysDiff } from './get_arrays_diff';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { SubscribeKey, SubscribeMethods } from '../m_subscribes';
import type Scheduler from '../scheduler';
import type { SubscribeKey, SubscribeMethods } from '../subscribes';

class NotifyScheduler {
scheduler: Scheduler;
Expand Down
12 changes: 6 additions & 6 deletions packages/devextreme/js/__internal/scheduler/scheduler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,16 @@ import type Scrollable from '@ts/ui/scroll_view/scrollable';

import { createA11yStatusContainer } from './a11y_status/a11y_status_render';
import { getA11yStatusText } from './a11y_status/a11y_status_text';
import type AppointmentDragBehavior from './appointment_drag_behavior';
import type { AppointmentFormConfig } from './appointment_popup/form';
import { AppointmentForm } from './appointment_popup/form';
import { AppointmentPopup } from './appointment_popup/popup';
import AppointmentCollection, { type AppointmentCollectionOptions } from './appointments/m_appointment_collection';
import AppointmentCollection, { type AppointmentCollectionOptions } from './appointments/appointment_collection';
import NotifyScheduler from './base/widget_notify_scheduler';
import { CompactAppointmentsHelper } from './compact_appointments_helper';
import { SchedulerHeader } from './header/header';
import type { HeaderOptions } from './header/types';
import { hide as hideLoading, show as showLoading } from './loading';
import type AppointmentDragBehavior from './m_appointment_drag_behavior';
import { CompactAppointmentsHelper } from './m_compact_appointments_helper';
import type { SubscribeKey, SubscribeMethods } from './m_subscribes';
import subscribes from './m_subscribes';
import { combineRemoteFilter } from './r1/filterting/remote';
import { createTimeZoneCalculator, type TimeZoneCalculator } from './r1/timezone_calculator/index';
import {
Expand All @@ -89,6 +87,8 @@ import {
} from './r1/utils/index';
import { validateRRule } from './recurrence/validate_rule';
import { SchedulerOptionsBaseWidget } from './scheduler_options_base_widget';
import type { SubscribeKey, SubscribeMethods } from './subscribes';
import subscribes from './subscribes';
import { DesktopTooltipStrategy } from './tooltip_strategies/desktop_tooltip_strategy';
import { MobileTooltipStrategy } from './tooltip_strategies/mobile_tooltip_strategy';
import type { AppointmentTooltipExtraOptions, AppointmentTooltipOptions } from './tooltip_strategies/tooltip_strategy_base';
Expand Down Expand Up @@ -116,9 +116,9 @@ import { getAppointmentGroupValues, setAppointmentGroupValues } from './utils/re
import { ResourceManager } from './utils/resource_manager/resource_manager';
import type { GroupValues } from './utils/resource_manager/types';
import timeZoneUtils, { type TimezoneLabel } from './utils_time_zone';
import { AppointmentDataSource } from './view_model/appointment_data_source';
import AppointmentLayoutManager from './view_model/appointments_layout_manager';
import type { CollectorCSS, RealSize } from './view_model/generate_view_model/steps/add_geometry/types';
import { AppointmentDataSource } from './view_model/m_appointment_data_source';
import type { AppointmentItemViewModel, AppointmentViewModelPlain, PanelName } from './view_model/types';
import SchedulerAgenda from './workspaces/agenda';
import type { PositionHelper } from './workspaces/helpers/position_helper';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ import {
import type { GroupOrientation, ViewType } from '@ts/scheduler/types';
import Scrollable, { type ScrollableProperties } from '@ts/ui/scroll_view/scrollable';

import AppointmentDragBehavior from '../appointment_drag_behavior';
import type NotifyScheduler from '../base/widget_notify_scheduler';
import {
APPOINTMENT_DRAG_SOURCE_CLASS,
Expand All @@ -81,14 +82,13 @@ import {
VERTICAL_GROUP_COUNT_CLASSES,
VIRTUAL_CELL_CLASS,
} from '../classes';
import { CompactAppointmentsHelper } from '../compact_appointments_helper';
import { APPOINTMENT_SETTINGS_KEY } from '../constants';
import { Cache } from '../global_cache';
import AppointmentDragBehavior from '../m_appointment_drag_behavior';
import { CompactAppointmentsHelper } from '../m_compact_appointments_helper';
import type { SubscribeKey, SubscribeMethods } from '../m_subscribes';
import type Scheduler from '../scheduler';
import type HorizontalCurrentTimeShader from '../shaders/current_time_shader_horizontal';
import VerticalShader from '../shaders/current_time_shader_vertical';
import type { SubscribeKey, SubscribeMethods } from '../subscribes';
import tableCreatorModule, { type GroupRows } from '../table_creator';
import type {
CellPositionData,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import $ from 'jquery';
import { Appointment } from '__internal/scheduler/appointments/appointment/m_appointment';
import { Appointment } from '__internal/scheduler/appointments/appointment/appointment';
import { Deferred } from 'core/utils/deferred';
import fx from 'common/core/animation/fx';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { getEmptyResourceManager } from '../../helpers/scheduler/mockResourceMan

import $ from 'jquery';
import '__internal/scheduler/workspaces/work_space_week';
import SchedulerAppointments from '__internal/scheduler/appointments/m_appointment_collection';
import SchedulerAppointments from '__internal/scheduler/appointments/appointment_collection';
import dblclickEvent from 'common/core/events/dblclick';
import translator from 'common/core/animation/translator';
import Resizable from 'ui/resizable';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { CustomStore } from 'common/data/custom_store';
import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change';
import { isFunction } from 'core/utils/type';
import $ from 'jquery';
import { AppointmentDataSource } from '__internal/scheduler/view_model/m_appointment_data_source';
import { AppointmentDataSource } from '__internal/scheduler/view_model/appointment_data_source';

import { createWrapper, initTestMarkup, SchedulerTestWrapper } from '../../helpers/scheduler/helpers.js';
import { waitForAsync, waitGlobalFailure } from '../../helpers/scheduler/waitForAsync.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import fx from 'common/core/animation/fx';
import dxScheduler from '__internal/scheduler/scheduler';
import { DataSource } from 'common/data/data_source/data_source';
import dateUtils from 'core/utils/date';
import { AppointmentDataSource } from '__internal/scheduler/view_model/m_appointment_data_source';
import { AppointmentDataSource } from '__internal/scheduler/view_model/appointment_data_source';

import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js';
import { waitAsync } from '../../helpers/scheduler/waitForAsync.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { mockDataAccessor } from '../../helpers/scheduler/mockDataAccessor.js';
import { createWrapper } from '../../helpers/scheduler/helpers.js';
import { waitAsync } from '../../helpers/scheduler/waitForAsync.js';
import themes from 'ui/themes';
import { CompactAppointmentsHelper } from '__internal/scheduler/m_compact_appointments_helper';
import { CompactAppointmentsHelper } from '__internal/scheduler/compact_appointments_helper';
import Widget from 'ui/widget/ui.widget';
import Color from 'color';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'fluent_blue_light.css!';
import '__internal/scheduler/m_subscribes';
import '__internal/scheduler/subscribes';
import '__internal/scheduler/scheduler';

import $ from 'jquery';
Expand Down
Loading