Compare commits
No commits in common. "81a8c6e52b96d99cb14d9e1a047de0ad00d31927" and "d2f9404c6d510eab8e81edd3190683cc2b66775e" have entirely different histories.
81a8c6e52b
...
d2f9404c6d
|
|
@ -70,12 +70,6 @@ namespace _dali.widgets
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [setting]
|
|
||||||
*/
|
|
||||||
private show_begin_time : boolean;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [state]
|
* [state]
|
||||||
*/
|
*/
|
||||||
|
|
@ -125,7 +119,6 @@ namespace _dali.widgets
|
||||||
{
|
{
|
||||||
"action_select_day": action_select_day = ((date) => {}),
|
"action_select_day": action_select_day = ((date) => {}),
|
||||||
"action_select_event": action_select_event = ((event_key) => {}),
|
"action_select_event": action_select_event = ((event_key) => {}),
|
||||||
"show_begin_time": show_begin_time = true,
|
|
||||||
"vertical": vertical = false,
|
"vertical": vertical = false,
|
||||||
"initial_year": initial_year = null,
|
"initial_year": initial_year = null,
|
||||||
"initial_week": initial_week = null,
|
"initial_week": initial_week = null,
|
||||||
|
|
@ -147,7 +140,6 @@ namespace _dali.widgets
|
||||||
=>
|
=>
|
||||||
void
|
void
|
||||||
);
|
);
|
||||||
show_begin_time ?: boolean;
|
|
||||||
vertical ?: boolean;
|
vertical ?: boolean;
|
||||||
initial_year ?: (null | int);
|
initial_year ?: (null | int);
|
||||||
initial_week ?: (null | int);
|
initial_week ?: (null | int);
|
||||||
|
|
@ -164,9 +156,6 @@ namespace _dali.widgets
|
||||||
this.action_select_day = action_select_day;
|
this.action_select_day = action_select_day;
|
||||||
this.action_select_event = action_select_event;
|
this.action_select_event = action_select_event;
|
||||||
|
|
||||||
// settings
|
|
||||||
this.show_begin_time = show_begin_time;
|
|
||||||
|
|
||||||
// state
|
// state
|
||||||
const ywd_now : lib_plankton.pit.type_ywd = lib_plankton.pit.to_ywd(lib_plankton.pit.now());
|
const ywd_now : lib_plankton.pit.type_ywd = lib_plankton.pit.to_ywd(lib_plankton.pit.now());
|
||||||
this.vertical = vertical;
|
this.vertical = vertical;
|
||||||
|
|
@ -360,8 +349,8 @@ namespace _dali.widgets
|
||||||
);
|
);
|
||||||
entries.sort(
|
entries.sort(
|
||||||
(entry1, entry2) => {
|
(entry1, entry2) => {
|
||||||
const b1 : lib_plankton.pit.type_pit = lib_plankton.pit.from_datetime(entry1.event_object.begin);
|
const b1 : string = lib_plankton.pit.datetime_format(entry1.event_object.begin);
|
||||||
const b2 : lib_plankton.pit.type_pit = lib_plankton.pit.from_datetime(entry2.event_object.begin);
|
const b2 : string = lib_plankton.pit.datetime_format(entry2.event_object.begin);
|
||||||
return ((b1 <= b2) ? -1 : +1);
|
return ((b1 <= b2) ? -1 : +1);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
@ -400,32 +389,7 @@ namespace _dali.widgets
|
||||||
"tableview-cell-entry",
|
"tableview-cell-entry",
|
||||||
{
|
{
|
||||||
"color": _dali.helpers.event_color(entry.hue),
|
"color": _dali.helpers.event_color(entry.hue),
|
||||||
"content": lib_plankton.string.coin(
|
"name": entry.event_object.name,
|
||||||
(
|
|
||||||
(
|
|
||||||
this.show_begin_time
|
|
||||||
&&
|
|
||||||
(entry.event_object.begin.time === null)
|
|
||||||
)
|
|
||||||
?
|
|
||||||
"{{name}}"
|
|
||||||
:
|
|
||||||
"{{begin}} | {{name}}"
|
|
||||||
),
|
|
||||||
{
|
|
||||||
"begin": (
|
|
||||||
(entry.event_object.begin.time === null)
|
|
||||||
?
|
|
||||||
null
|
|
||||||
:
|
|
||||||
lib_plankton.pit.time_format(
|
|
||||||
entry.event_object.begin.time,
|
|
||||||
{"show_seconds": false}
|
|
||||||
)
|
|
||||||
),
|
|
||||||
"name": entry.event_object.name,
|
|
||||||
}
|
|
||||||
),
|
|
||||||
"rel": entry.key,
|
"rel": entry.key,
|
||||||
"additional_classes": lib_plankton.string.coin(
|
"additional_classes": lib_plankton.string.coin(
|
||||||
" access_level-{{access_level}}",
|
" access_level-{{access_level}}",
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
<li class="weekview-event_entry{{additional_classes}}" style="background-color: {{color}};" rel="{{rel}}">
|
<li class="weekview-event_entry{{additional_classes}}" style="background-color: {{color}};" rel="{{rel}}">
|
||||||
{{content}}
|
{{name}}
|
||||||
</li>
|
</li>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue