commit

components/Extras/calendar.view.js

@@ -12,7 +12,7 @@ import interactionPlugin, { Draggable } from "@fullcalendar/interaction";
 import listPlugin from "@fullcalendar/list";
 import bootstrapPlugin from "@fullcalendar/bootstrap";
 import Select from "react-select";
-import moment from "moment";
+import moment from "moment-timezone";
 import { connect } from "react-redux";
 import Loader from "@/components/Common/Loader";
 import Router from "next/router";
@@ -91,8 +91,8 @@ class Calendar extends Component {
 		const dataEvent = this.state.dataLaporan.data.map((e) => ({
 			id: e._id,
 			title: e.jadwal.judul,
-			start: new Date(e.jadwal.dari_tanggal),
-			end: new Date(e.jadwal.sampai_tanggal),
+			start: moment(e.jadwal.dari_tanggal).format("YYYY-MM-DD"),
+			end: moment(e.jadwal.sampai_tanggal).add(1, "d").format("YYYY-MM-DD"),
 			backgroundColor: e.jadwal.warna,
 			borderColor: e.jadwal.warna,
 		}));
@@ -226,8 +226,8 @@ class Calendar extends Component {
 														enableReinitialize={true}
 														initialValues={{
 															judul: laporan.data?.jadwal?.judul ? laporan.data.jadwal.judul.split("- ")[1] : "",
-															dari_tanggal: laporan.data?.jadwal?.dari_tanggal ? moment(laporan.data.jadwal.dari_tanggal) : "",
-															sampai_tanggal: laporan.data?.jadwal?.sampai_tanggal ? moment(laporan.data.jadwal.sampai_tanggal) : "",
+															dari_tanggal: laporan.data?.jadwal?.dari_tanggal ? moment(laporan.data.jadwal.dari_tanggal).format("DD MMMM YYYY") : "",
+															sampai_tanggal: laporan.data?.jadwal?.sampai_tanggal ? moment(laporan.data.jadwal.sampai_tanggal).format("DD MMMM YYYY") : "",
 														}}
 														validationSchema={jadwalSchema}
 														onSubmit={this.handleEventCalendar}
@@ -258,7 +258,7 @@ class Calendar extends Component {
 																						inputProps={{ className: "form-control" }}
 																						value={field.value}
 																						onChange={(e) => {
-																							form.setFieldValue(field.name, e);
+																							form.setFieldValue(field.name, e.format("DD MMMM YYYY"));
 																						}}
 																					/>
 																				)}
@@ -276,7 +276,7 @@ class Calendar extends Component {
 																						inputProps={{ className: "form-control" }}
 																						value={field.value}
 																						onChange={(e) => {
-																							form.setFieldValue(field.name, e);
+																							form.setFieldValue(field.name, e.format("DD MMMM YYYY"));
 																						}}
 																					/>
 																				)}