commit

components/Extras/calendar.view.js

@@ -34,9 +34,9 @@ const statusLLDIKTI = [
 ];
 
 const jadwalSchema = Yup.object().shape({
-	judul: Yup.string().required("Required"),
-	dari_tanggal: Yup.date().required("Required"),
-	sampai_tanggal: Yup.date().required("Required"),
+	judul: Yup.string().required("Wajib diisi"),
+	dari_tanggal: Yup.date().required("Wajib diisi"),
+	sampai_tanggal: Yup.date().required("Wajib diisi"),
 });
 
 const laporanSchema = Yup.object().shape({
@@ -166,9 +166,9 @@ class Calendar extends Component {
 				update = await updateLaporan(token, id, data);
 			}
 			if (!update) {
-				toast.update(toastid, { render: "All is not good", type: "error", isLoading: false, autoClose: true, closeButton: true });
+				toast.update(toastid, { render: "Gagal simpan jadwal", type: "error", isLoading: false, autoClose: true, closeButton: true });
 			} else {
-				toast.update(toastid, { render: "All is good", type: "success", isLoading: false, autoClose: true, closeButton: true });
+				toast.update(toastid, { render: "Input jadwal berhasil", type: "success", isLoading: false, autoClose: true, closeButton: true });
 				Router.push("/app/penjadwalan");
 			}
 		}
@@ -252,7 +252,7 @@ class Calendar extends Component {
 															""
 														) : (
 															<FormGroup>
-																<label className="col-form-label">Keterangan</label>
+																<label className="col-form-label">Keterangan<span className=" text-danger">*</span></label>
 																<Field name="keterangan">{({ field, form }) => <Input type="text" placeholder="Keterangan" {...field} />}</Field>
 																<ErrorMessage name="keterangan" component="div" className="form-text text-danger" />
 															</FormGroup>
@@ -297,7 +297,7 @@ class Calendar extends Component {
 																</FormGroup>
 
 																<FormGroup>
-																	<label className="col-form-label">Judul</label>
+																	<label className="col-form-label">Judul<span className=" text-danger">*</span></label>
 																	<Field name="judul">{({ field, form }) => <Input disabled={laporan.data?.sanksi} type="text" placeholder="judul" {...field} />}</Field>
 																	<ErrorMessage name="judul" component="div" className="form-text text-danger" />
 																</FormGroup>

components/Pelaporan/InputData.js

@@ -52,9 +52,9 @@ const checkIfFilesAreCorrectType = (files) => {
 const selectInstanceId = 1;
 const laporanSchema = Yup.object().shape({
 	no_laporan: Yup.string().required(""),
-	keterangan: Yup.string().min(3, "Minimal 3 Huruf").max(200).required(""),
-	pelanggaran: Yup.array().min(1, " ").required(),
-	dokumen: Yup.array().min(1, " ").required().test("filesize", "Maksimal ukuran dokumen 15mb", checkIfFilesAreTooBig),
+	keterangan: Yup.string().min(3, "Minimal 3 Huruf").max(200).required("Wajib isi keterangan"),
+	pelanggaran: Yup.array().min(1, "Wajib pilih pelanggaran").required(),
+	dokumen: Yup.array().min(1, "Wajib upload file pendukung").required("Harus upload file").test("filesize", "Maksimal ukuran dokumen 15mb", checkIfFilesAreTooBig),
 });
 export class InputData extends Component {
 	constructor(props) {
@@ -220,7 +220,7 @@ export class InputData extends Component {
 						</FormGroup>
 
 						<FormGroup row>
-							<label className="col-md-2 col-form-label">Upload File Pendukung</label>
+							<label className="col-md-2 col-form-label">Upload File Pendukung<span className=" text-danger">*</span></label>
 							<div className="col-md-10">
 								<Field name="dokumen">
 									{({ field, form, meta }) => (

components/Pemeriksaan/InputEvaluasi.js

@@ -129,17 +129,24 @@ class InputEvaluasi extends Component {
 		data.dokumen.forEach((e) => {
 			formdata.append("dokumen", e);
 		});
-
-		await toast.promise(insertPemeriksaan(token, id, formdata), {
-			pending: "Loading",
-			success: "Success",
-			error: "Error",
-		});
 		if (this.state.delegasichecklist == true) {
+			await toast.promise(insertPemeriksaan(token, id, formdata), {
+				pending: "Loading",
+				success: "Success",
+				error: "Error",
+
+			});
+
 			data.change_role = "true";
 			data.keterangan = "delegasi ke DIKTI"
-			update = await updateLaporan(token, id, data);
 			Router.push("/app/pemeriksaan");
+			update = await updateLaporan(token, id, data);
+		} else {
+			await toast.promise(insertPemeriksaan(token, id, formdata), {
+				pending: "Loading",
+				success: "Success",
+				error: "Error",
+			});
 		}
 		this.setState({ files: [] });
 		resetForm();