Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
students
Today KU
Commits
b64454c7
Commit
b64454c7
authored
Nov 05, 2021
by
Kim, Subin
Browse files
KUSchedule event 색상추가 수정중
parent
57fa1294
Changes
3
Show whitespace changes
Inline
Side-by-side
client/src/components/Calendar/AdminMonthly.js
View file @
b64454c7
...
@@ -127,7 +127,7 @@ const AdminMonthly = () => {
...
@@ -127,7 +127,7 @@ const AdminMonthly = () => {
return
<
button
type
=
"
button
"
className
=
"
btn btn-primary
"
data
-
bs
-
toggle
=
"
modal
"
data
-
bs
-
target
=
"
#scheduleModal
"
><
/button
>
return
<
button
type
=
"
button
"
className
=
"
btn btn-primary
"
data
-
bs
-
toggle
=
"
modal
"
data
-
bs
-
target
=
"
#scheduleModal
"
><
/button
>
}}
}}
timeZone
=
"
local
"
timeZone
=
"
local
"
events
=
{
scheduleList
,
{
color
:
'
crimson
'
}
}
events
=
{
scheduleList
}
themeSystem
=
'
bootstrap
'
themeSystem
=
'
bootstrap
'
height
=
'
78vh
'
height
=
'
78vh
'
/>
/>
...
...
client/src/scss/custom.scss
View file @
b64454c7
...
@@ -157,4 +157,10 @@ button {
...
@@ -157,4 +157,10 @@ button {
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
}
}
}
}
&
.first
{
border-color
:
#EE8DA0
;
background-color
:
#EE8DA0
;
color
:
#fff
;
}
}
}
\ No newline at end of file
server/controllers/schedule.controller.js
View file @
b64454c7
...
@@ -130,7 +130,7 @@ const findbyDate = async (req, res, next) => {
...
@@ -130,7 +130,7 @@ const findbyDate = async (req, res, next) => {
schedule
.
dataValues
.
end
=
dateToString
(
schedule
.
dataValues
.
end
,
"
full
"
)
schedule
.
dataValues
.
end
=
dateToString
(
schedule
.
dataValues
.
end
,
"
full
"
)
schedule
.
dataValues
.
start
=
dateToString
(
schedule
.
dataValues
.
start
,
"
full
"
)
schedule
.
dataValues
.
start
=
dateToString
(
schedule
.
dataValues
.
start
,
"
full
"
)
schedule
.
dataValues
.
allDay
=
true
schedule
.
dataValues
.
allDay
=
true
schedule
.
dataValues
.
className
=
'
text
'
schedule
.
dataValues
.
className
=
[
'
text
'
,
'
first
'
]
})
})
if
(
req
.
userId
===
"
ku
"
)
{
if
(
req
.
userId
===
"
ku
"
)
{
findList
=
findKUList
findList
=
findKUList
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment