Merge branch 'thkim'
commit
097089d048
|
|
@ -150,28 +150,16 @@ function Schedules(props) {
|
|||
if (day !== 0) {//당월 일별 구현
|
||||
let sDate = day.toString().length === 1 ? "0" + day.toString() : day.toString();
|
||||
let iUseDate = Number(mutsUseYearMonth + sDate);
|
||||
if (scheduleList.length > 0) {//일정 있는 경우
|
||||
if (scheduleList.length > 0 || sDate === "01") {//일정 있는 경우
|
||||
return (
|
||||
<td key={keyIdx++}>
|
||||
<Link to={{pathname: URL.ADMIN_SCHEDULE_CREATE}} state={{iUseDate : mutsUseYearMonth + sDate + "000000"}} className="day" key={keyIdx++}>{day}</Link><br />
|
||||
{
|
||||
scheduleList.map((schedule, scheduleIdx) => {
|
||||
let iBeginDate = Number(schedule.schdulBgnde.substring(0, 8));
|
||||
let iEndDate = Number(schedule.schdulEndde.substring(0, 8));
|
||||
innerConsole("scheduleList ", day, scheduleIdx, iBeginDate, iUseDate, iEndDate, iUseDate >= iBeginDate && iUseDate <= iEndDate);
|
||||
innerConsole("schedule.schdulId ", schedule.schdulId);
|
||||
if (iUseDate >= iBeginDate && iUseDate <= iEndDate) {
|
||||
return (
|
||||
<>
|
||||
<Link to={{pathname: URL.ADMIN_SCHEDULE_DETAIL}}
|
||||
state={{schdulId : schedule.schdulId}}
|
||||
key={keyIdx++}>{schedule.schdulNm}
|
||||
</Link>
|
||||
<br />
|
||||
</>
|
||||
);
|
||||
} else return <></>
|
||||
})
|
||||
<div>
|
||||
<div>오후 03:00 [P] 해양경찰청</div>
|
||||
<div>오후 05:00 [P] 미팅...</div>
|
||||
</div>
|
||||
|
||||
}
|
||||
</td>
|
||||
);
|
||||
|
|
@ -299,7 +287,7 @@ function Schedules(props) {
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{calendarTag}
|
||||
{true && calendarTag}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue