Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dashboard
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AURA
dashboard
Commits
fcf1f20e
Commit
fcf1f20e
authored
8 months ago
by
Konrad Mohrfeldt
Browse files
Options
Downloads
Patches
Plain Diff
feat(Calendar): highlight timeslots of the station fallback show
refs
#128
parent
b5c3148e
No related branches found
No related tags found
No related merge requests found
Pipeline
#8349
passed
8 months ago
Stage: test
Stage: release
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Pages/Calendar.vue
+6
-1
6 additions, 1 deletion
src/Pages/Calendar.vue
src/tailwind.css
+15
-2
15 additions, 2 deletions
src/tailwind.css
with
21 additions
and
3 deletions
src/Pages/Calendar.vue
+
6
−
1
View file @
fcf1f20e
...
...
@@ -122,6 +122,7 @@ import AConflictResolver from '@/components/schedule/AConflictResolver.vue'
import
{
ScheduleConflictResponse
,
TimeSlot
}
from
'
@/types
'
import
{
DateSelectArg
,
EventClickArg
}
from
'
@fullcalendar/core
'
import
{
useProgramSlots
}
from
'
@/stores/program
'
import
{
useCurrentRadioSettings
}
from
'
@/stores/radio-settings
'
const
slotDurationMinutes
=
15
...
...
@@ -136,6 +137,7 @@ const rruleStore = useRRuleStore()
const
showStore
=
useShowStore
()
const
timeslotStore
=
useTimeSlotStore
()
const
playlistStore
=
usePlaylistStore
()
const
radioSettings
=
useCurrentRadioSettings
()
const
canAddSchedule
=
useHasUserPermission
([
'
program.add_schedule
'
])
const
CreateSchedule
=
createTemplatePromise
<
undefined
,
[
Date
,
Date
]
>
()
...
...
@@ -199,7 +201,10 @@ const calendarEvents = computedAsync(async () => {
show
?.
ownerIds
?.
includes
?.(
authStore
?.
steeringUser
?.
id
as
SteeringUser
[
'
id
'
])
??
false
const
className
=
[
'
calendar-event
'
,
isOwner
?
'
is-mine
'
:
'
is-not-mine
'
]
if
(
durationMinutes
<
0
)
className
.
push
(
'
is-invalid
'
)
if
(
entry
.
timeslotId
===
null
)
className
.
push
(
'
is-fallback
'
)
if
(
entry
.
timeslotId
)
className
.
push
(
'
is-scheduled
'
)
else
className
.
push
(
'
is-generated
'
)
if
(
entry
.
timeslotId
===
null
||
radioSettings
.
value
?.
program
.
fallback
.
showId
===
show
?.
id
)
className
.
push
(
'
is-fallback
'
)
else
className
.
push
(
'
is-normal
'
)
const
title
=
sanitizeHTML
(
show
?.
name
??
''
)
+
emptyText
...
...
This diff is collapsed.
Click to expand it.
src/tailwind.css
+
15
−
2
View file @
fcf1f20e
...
...
@@ -283,16 +283,29 @@ thead .fc-day-selected:hover {
display
:
none
;
}
&
.is-scheduled
{
@apply
tw-border;
}
&
.is-normal
{
@apply
tw-bg-gray-100
tw-border-gray-200
tw-text-gray-900
hocus
:
tw-bg-gray-200
;
}
&
.is-mine
{
@apply
tw-bg-gray-700
tw-border-gray-800
tw-text-white
hocus
:
tw-bg-gray-800
;
@apply
tw-bg-gray-700
tw-border-gray-900
tw-text-white
hocus
:
tw-bg-gray-800
;
}
&
.is-generated
{
@apply
tw-pointer-events-none;
}
&
.is-fallback
{
@apply
tw-bg-yellow-50
tw-border-yellow-50
tw-text-yellow-900
dark
:
tw-bg-yellow-950
dark
:
tw-border-yellow-950
tw-pointer-events-none
;
@apply
tw-bg-yellow-50
tw-border-yellow-50
tw-text-yellow-900
dark
:
tw-bg-yellow-950
dark
:
tw-border-yellow-950
;
&.is-scheduled
{
@apply
tw-border-yellow-600
hocus
:
tw-bg-yellow-100
;
}
&
.fc-event-main
{
@apply
tw-relative
tw-h-full;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment