Эх сурвалжийг харах

fix button, dan issue 28-09

andi 3 жил өмнө
parent
commit
f4cf0798fd

+ 1 - 1
components/Banding/TableSanksi.js

@@ -58,7 +58,7 @@ function TableSanksi({ listData, to, linkName }) {
 															query: { id: data._id },
 															query: { id: data._id },
 														}}
 														}}
 													>
 													>
-														<Button className="color-3e3a8e btn-login" color >
+														<Button className="btn-login" color >
 															<span className="font-color-white">
 															<span className="font-color-white">
 																{linkName}
 																{linkName}
 															</span>
 															</span>

+ 6 - 1
components/Extras/calendar.view.js

@@ -64,6 +64,7 @@ class Calendar extends Component {
 			laporan: {},
 			laporan: {},
 			selectedOption: null,
 			selectedOption: null,
 			color: "",
 			color: "",
+			disabled: true,
 		};
 		};
 	}
 	}
 
 
@@ -241,6 +242,7 @@ class Calendar extends Component {
 																		}}
 																		}}
 																		options={this.getStatus()}
 																		options={this.getStatus()}
 																		required
 																		required
+																		isDisabled={laporan.data?.sanksi}
 																	/>
 																	/>
 																)}
 																)}
 															</Field>
 															</Field>
@@ -296,7 +298,7 @@ class Calendar extends Component {
 
 
 																<FormGroup>
 																<FormGroup>
 																	<label className="col-form-label">Judul</label>
 																	<label className="col-form-label">Judul</label>
-																	<Field name="judul">{({ field, form }) => <Input type="text" placeholder="judul" {...field} />}</Field>
+																	<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" />
 																	<ErrorMessage name="judul" component="div" className="form-text text-danger" />
 																</FormGroup>
 																</FormGroup>
 																<Row>
 																<Row>
@@ -306,6 +308,8 @@ class Calendar extends Component {
 																			<Field name="dari_tanggal">
 																			<Field name="dari_tanggal">
 																				{({ field, form }) => (
 																				{({ field, form }) => (
 																					<Datetime
 																					<Datetime
+																						open={false}
+																						updateOnView={false}
 																						timeFormat={false}
 																						timeFormat={false}
 																						inputProps={{ className: "form-control" }}
 																						inputProps={{ className: "form-control" }}
 																						value={field.value}
 																						value={field.value}
@@ -324,6 +328,7 @@ class Calendar extends Component {
 																			<Field name="sampai_tanggal">
 																			<Field name="sampai_tanggal">
 																				{({ field, form }) => (
 																				{({ field, form }) => (
 																					<Datetime
 																					<Datetime
+																						closeOnSelect={false}
 																						timeFormat={false}
 																						timeFormat={false}
 																						inputProps={{ className: "form-control" }}
 																						inputProps={{ className: "form-control" }}
 																						value={field.value}
 																						value={field.value}

+ 2 - 2
components/Keberatan/TableSanksi.js

@@ -8,7 +8,7 @@ function TableSanksi({ listData, to, linkName }) {
 		<div className="card b">
 		<div className="card b">
 			<div className="card-body card-over">
 			<div className="card-body card-over">
 				<Datatable options={{ responsive: false }}>
 				<Datatable options={{ responsive: false }}>
-					<table className="table w-100" data-order='[3,"asc"]'>
+					<table className="table w-100" data-order='[[3, "desc"]]'>
 						<thead>
 						<thead>
 							<tr>
 							<tr>
 								<th>Nomor Sanksi</th>
 								<th>Nomor Sanksi</th>
@@ -58,7 +58,7 @@ function TableSanksi({ listData, to, linkName }) {
 															query: { id: data._id },
 															query: { id: data._id },
 														}}
 														}}
 													>
 													>
-														<Button className="color-3e3a8e" color >
+														<Button className="btn-login" color >
 															<span className="font-color-white">
 															<span className="font-color-white">
 																{linkName}
 																{linkName}
 															</span>
 															</span>

+ 1 - 1
components/Main/TableLaporan.js

@@ -67,7 +67,7 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 															query: { id: data._id },
 															query: { id: data._id },
 														}}
 														}}
 													>
 													>
-														<Button className="color-3e3a8e btn-login" color>
+														<Button className="btn-login" color>
 															<span className="font-color-white">
 															<span className="font-color-white">
 																{linkName}
 																{linkName}
 															</span>
 															</span>

+ 2 - 2
components/Main/TableSanksi.js

@@ -9,7 +9,7 @@ function TableSanksi({ listData, to, linkName }) {
 			<div className="card-body card-over">
 			<div className="card-body card-over">
 				{listData && (
 				{listData && (
 					<Datatable options={{ responsive: false }}>
 					<Datatable options={{ responsive: false }}>
-						<table className="table w-100">
+						<table className="table w-100" data-order='[[3, "desc"]]'>
 							<thead>
 							<thead>
 								<tr>
 								<tr>
 									<th>Nomor Sanksi</th>
 									<th>Nomor Sanksi</th>
@@ -55,7 +55,7 @@ function TableSanksi({ listData, to, linkName }) {
 																query: { id: data._id },
 																query: { id: data._id },
 															}}
 															}}
 														>
 														>
-															<Button className="color-3e3a8e btn-login" color >
+															<Button className="btn-login" color >
 																<span className="font-color-white">
 																<span className="font-color-white">
 																	{linkName}
 																	{linkName}
 																</span>
 																</span>

+ 1 - 1
components/Main/Timeline.js

@@ -41,7 +41,7 @@ function Timeline({ data, noFile = false, noJadwal = false }) {
 																<br />
 																<br />
 															</>
 															</>
 														)}
 														)}
-														{data.sanksi?.no_sanksi ? `No. Sanksi ${data.sanksi.no_sanksi}` : `No. Laporan ${data.laporan.no_laporan}`}
+														{/* {data.sanksi?.no_sanksi ? `No. Sanksi ${data.sanksi.no_sanksi}` : `No. Laporan ${data.laporan.no_laporan}`} */}
 														<p className="text-muted m-0">{moment(data.createdAt).format("hh:mm")}</p>
 														<p className="text-muted m-0">{moment(data.createdAt).format("hh:mm")}</p>
 													</p>
 													</p>
 												</div>
 												</div>

+ 1 - 1
components/PT/CabutSanksi/TableSanksiJawaban.js

@@ -39,7 +39,7 @@ function TableSanksi({ listData, to, linkName }) {
 									<td>
 									<td>
 										{data.sanksi.cabut_sanksi?.jawaban ? (
 										{data.sanksi.cabut_sanksi?.jawaban ? (
 											<Link href={{ pathname: to, query: { noSanksi: data.sanksi.no_sanksi } }}>
 											<Link href={{ pathname: to, query: { noSanksi: data.sanksi.no_sanksi } }}>
-												<Button className="color-3e3a8e btn-login" color >
+												<Button className="btn-login" color >
 													<span className="font-color-white">
 													<span className="font-color-white">
 														{linkName}
 														{linkName}
 													</span>
 													</span>

+ 1 - 1
components/PT/JawabanBanding/DetailJawaban.js

@@ -49,7 +49,7 @@ function DetailJawaban({ data, sanksiId }) {
 					}}
 					}}
 				>
 				>
 					{/* <Button color="primary">Perbaiki Dokumen</Button> */}
 					{/* <Button color="primary">Perbaiki Dokumen</Button> */}
-					<Button color className="btn-login color-3e3a8e">
+					<Button color className="btn-login">
 						<span className="font-color-white">
 						<span className="font-color-white">
 							Dokumen Perbaikan
 							Dokumen Perbaikan
 						</span>
 						</span>

+ 1 - 1
components/PT/JawabanBanding/TableSanksiJawaban.js

@@ -49,7 +49,7 @@ function TableSanksi({ listData, to, linkName }) {
 									<td>
 									<td>
 										{data.jawaban?.banding ? (
 										{data.jawaban?.banding ? (
 											<Link href={{ pathname: to, query: { id: data._id } }}>
 											<Link href={{ pathname: to, query: { id: data._id } }}>
-												<Button className="color-3e3a8e btn-login" color >
+												<Button className="btn-login" color >
 													<span className="font-color-white">
 													<span className="font-color-white">
 														{linkName}
 														{linkName}
 													</span>
 													</span>

+ 4 - 4
components/PT/JawabanKeberatan/ModalPermohonan.js

@@ -135,10 +135,10 @@ export class ModalPermohonan extends Component {
 					<ModalBody>Apakah anda akan mengajukan banding?</ModalBody>
 					<ModalBody>Apakah anda akan mengajukan banding?</ModalBody>
 					<ModalFooter>
 					<ModalFooter>
 						<Button color className="btn-login" onClick={this.toggleModal1}>
 						<Button color className="btn-login" onClick={this.toggleModal1}>
-							Ya
+							<span className="font-color-white">Ya</span>
 						</Button>{" "}
 						</Button>{" "}
 						<Button color className="btn-login" onClick={this.props.toggleModal}>
 						<Button color className="btn-login" onClick={this.props.toggleModal}>
-							Tidak
+							<span className="font-color-white">Tidak</span>
 						</Button>
 						</Button>
 					</ModalFooter>
 					</ModalFooter>
 				</Modal>
 				</Modal>
@@ -207,8 +207,8 @@ export class ModalPermohonan extends Component {
 								</FormGroup>
 								</FormGroup>
 							</ModalBody>
 							</ModalBody>
 							<ModalFooter>
 							<ModalFooter>
-								<Button color="primary" type="submit">
-									Kirim
+								<Button color className="btn-login" type="submit">
+									<span className="font-color-white">Kirim</span>
 								</Button>
 								</Button>
 							</ModalFooter>
 							</ModalFooter>
 						</Form>
 						</Form>

+ 1 - 1
components/PT/JawabanKeberatan/TableSanksiJawaban.js

@@ -49,7 +49,7 @@ function TableSanksi({ listData, to, linkName }) {
 									<td>
 									<td>
 										{data.jawaban?.keberatan ? (
 										{data.jawaban?.keberatan ? (
 											<Link href={{ pathname: to, query: { id: data._id } }}>
 											<Link href={{ pathname: to, query: { id: data._id } }}>
-												<Button className="color-3e3a8e btn-login" color >
+												<Button className="btn-login" color >
 													<span className="font-color-white">
 													<span className="font-color-white">
 														{linkName}
 														{linkName}
 													</span>
 													</span>

+ 1 - 1
components/PT/JawabanPencabutanSanksi/TableSanksiJawaban.js

@@ -48,7 +48,7 @@ function TableSanksi({ listData, to, linkName }) {
 									<td>
 									<td>
 										{data.jawaban?.cabut_sanksi ? (
 										{data.jawaban?.cabut_sanksi ? (
 											<Link href={{ pathname: to, query: { id: data._id } }}>
 											<Link href={{ pathname: to, query: { id: data._id } }}>
-												<Button className="color-3e3a8e btn-login" color >
+												<Button className="btn-login" color >
 													<span className="font-color-white">
 													<span className="font-color-white">
 														{linkName}
 														{linkName}
 													</span>
 													</span>

+ 2 - 2
components/PT/Keberatan/ModalPermohonan.js

@@ -209,8 +209,8 @@ export class ModalPermohonan extends Component {
 								</FormGroup>
 								</FormGroup>
 							</ModalBody>
 							</ModalBody>
 							<ModalFooter>
 							<ModalFooter>
-								<Button color className=" color-3e3a8e btn-login" type="submit">
-									Kirim
+								<Button color className="btn-login" type="submit">
+									<span className="font-color-white">Kirim</span>
 								</Button>
 								</Button>
 							</ModalFooter>
 							</ModalFooter>
 						</Form>
 						</Form>

+ 1 - 1
components/PT/TableSanksi.js

@@ -47,7 +47,7 @@ function TableSanksi({ listData, to, linkName }) {
 									{/* <td>{moment(data.createdAt).format("DD MMMM YYYY")}</td> */}
 									{/* <td>{moment(data.createdAt).format("DD MMMM YYYY")}</td> */}
 									<td>
 									<td>
 										<Link href={{ pathname: to, query: { id: data._id } }}>
 										<Link href={{ pathname: to, query: { id: data._id } }}>
-											<Button className="color-3e3a8e btn-login" color >
+											<Button className="btn-login" color >
 												<span className="font-color-white">
 												<span className="font-color-white">
 													{linkName}
 													{linkName}
 												</span>
 												</span>

+ 1 - 1
components/PT/TableSanksiJawaban.js

@@ -34,7 +34,7 @@ function TableSanksi({ listData, to, linkName }) {
 									<td>
 									<td>
 										{data.sanksi.keberatan?.jawaban || data.sanksi.banding?.jawaban || data.sanksi.cabut_sanksi?.jawaban ? (
 										{data.sanksi.keberatan?.jawaban || data.sanksi.banding?.jawaban || data.sanksi.cabut_sanksi?.jawaban ? (
 											<Link href={{ pathname: to, query: { noSanksi: data.sanksi.no_sanksi } }}>
 											<Link href={{ pathname: to, query: { noSanksi: data.sanksi.no_sanksi } }}>
-												<Button color className="color-3e3a8e btn-login">{linkName}</Button>
+												<Button color className="btn-login">{linkName}</Button>
 											</Link>
 											</Link>
 										) : (
 										) : (
 											<div className="badge-info badge">Menunggu Jawaban</div>
 											<div className="badge-info badge">Menunggu Jawaban</div>

+ 1 - 1
components/Pelaporan/InputData.js

@@ -271,7 +271,7 @@ export class InputData extends Component {
 						</FormGroup>
 						</FormGroup>
 						<FormGroup row>
 						<FormGroup row>
 							<div className="col-xl-10">
 							<div className="col-xl-10">
-								<Button className="color-3e3a8e" color type="submit" disabled={isSubmitting}>
+								<Button className="btn-login" color type="submit" disabled={isSubmitting}>
 									<span className="font-color-white">
 									<span className="font-color-white">
 										Submit Laporan
 										Submit Laporan
 									</span>
 									</span>

+ 1 - 1
components/Pelaporan/TableLaporan.js

@@ -77,7 +77,7 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
                                                             query: { id: data._id },
                                                             query: { id: data._id },
                                                         }}
                                                         }}
                                                     >
                                                     >
-                                                        <Button className="color-3e3a8e btn-login loader" color>
+                                                        <Button className="btn-login loader" color>
                                                             <span className="font-color-white">
                                                             <span className="font-color-white">
                                                                 {linkName}
                                                                 {linkName}
                                                             </span>
                                                             </span>

+ 2 - 2
components/PelaporanTuntas/TableLaporan.js

@@ -38,7 +38,7 @@ function TableLaporan({ listData, to, linkName }) {
 													<div className="media align-items-center">
 													<div className="media align-items-center">
 														<div className="media-body d-flex">
 														<div className="media-body d-flex">
 															<div>
 															<div>
-																<h4 className="m-0">{data.pt?.nama.length > 64 || data.laporan?.pt.nama.length > 64 ? data.pt?.nama.substring(0, 64) + "..." ||  data.laporan?.pt.nama.substring(0, 64) + "..." : data.pt?.nama || data.laporan?.pt.nama}</h4>
+																<h4 className="m-0">{data.pt?.nama.length > 64 || data.laporan?.pt.nama.length > 64 ? data.pt?.nama.substring(0, 64) + "..." || data.laporan?.pt.nama.substring(0, 64) + "..." : data.pt?.nama || data.laporan?.pt.nama}</h4>
 																<p className="w-105">{data.keterangan}</p>
 																<p className="w-105">{data.keterangan}</p>
 															</div>
 															</div>
 														</div>
 														</div>
@@ -56,7 +56,7 @@ function TableLaporan({ listData, to, linkName }) {
 															query: { id: data._id },
 															query: { id: data._id },
 														}}
 														}}
 													>
 													>
-														<Button className="color-3e3a8e btn-login loader" color>
+														<Button className="btn-login loader" color>
 															<span className="font-color-white">
 															<span className="font-color-white">
 																{linkName}
 																{linkName}
 															</span>
 															</span>

+ 3 - 3
components/Pemeriksaan/InputEvaluasi.js

@@ -3,7 +3,7 @@ import { insertPemeriksaan } from "@/actions/pemeriksaan";
 import Router from "next/router";
 import Router from "next/router";
 import Datetime from "react-datetime";
 import Datetime from "react-datetime";
 import moment from "moment";
 import moment from "moment";
-import { Row, Col, FormGroup, Input } from "reactstrap";
+import { Row, Col, FormGroup, Input, Button } from "reactstrap";
 import { ToastContainer, toast } from "react-toastify";
 import { ToastContainer, toast } from "react-toastify";
 import { Formik, Form, Field, ErrorMessage } from "formik";
 import { Formik, Form, Field, ErrorMessage } from "formik";
 import * as Yup from "yup";
 import * as Yup from "yup";
@@ -264,11 +264,11 @@ class InputEvaluasi extends Component {
 						) : ("")}
 						) : ("")}
 						<FormGroup row>
 						<FormGroup row>
 							<div className="col-xl-10">
 							<div className="col-xl-10">
-								<button className="btn btn-sm color-3e3a8e" type="submit">
+								<Button color className="btn-login" type="submit">
 									<span className="font-color-white">
 									<span className="font-color-white">
 										Simpan Evaluasi
 										Simpan Evaluasi
 									</span>
 									</span>
-								</button>
+								</Button>
 							</div>
 							</div>
 						</FormGroup>
 						</FormGroup>
 					</Form>
 					</Form>

+ 1 - 1
components/Pemeriksaan/TableLaporan.js

@@ -61,7 +61,7 @@ function TableLaporan({ listData, to, linkName }) {
 															query: { id: data._id },
 															query: { id: data._id },
 														}}
 														}}
 													>
 													>
-														<Button className="color-3e3a8e btn-login" color >
+														<Button className="btn-login" color >
 															<span className="font-color-white">
 															<span className="font-color-white">
 																{linkName}
 																{linkName}
 															</span>
 															</span>

+ 1 - 1
components/PencabutanSanksi/TableSanksi.js

@@ -58,7 +58,7 @@ function TableSanksi({ listData, to, linkName }) {
 															query: { id: data._id },
 															query: { id: data._id },
 														}}
 														}}
 													>
 													>
-														<Button className="color-3e3a8e" color >
+														<Button className="btn-login" color >
 															<span className="font-color-white">
 															<span className="font-color-white">
 																{linkName}
 																{linkName}
 															</span>
 															</span>

+ 1 - 1
components/Penjadwalan/TableLaporan.js

@@ -61,7 +61,7 @@ function TableLaporan({ listData, to, linkName }) {
 															query: { id: data._id },
 															query: { id: data._id },
 														}}
 														}}
 													>
 													>
-														<Button className="color-3e3a8e btn-login loader" color>
+														<Button className="btn-login" color>
 															<span className="font-color-white">
 															<span className="font-color-white">
 																Edit
 																Edit
 															</span>
 															</span>

+ 1 - 1
components/Sanksi/TableLaporan.js

@@ -58,7 +58,7 @@ function TableLaporan({ listData }) {
 															query: { id: data.sanksi || data._id },
 															query: { id: data.sanksi || data._id },
 														}}
 														}}
 													>
 													>
-														<Button className="color-3e3a8e btn-login" color>
+														<Button className="btn-login" color>
 															<span className="font-color-white">
 															<span className="font-color-white">
 																{data.sanksi ? "Detail" : "Proses Sanksi"}
 																{data.sanksi ? "Detail" : "Proses Sanksi"}
 															</span>
 															</span>

+ 1 - 1
components/Sanksi/UploadSurat.js

@@ -235,7 +235,7 @@ export class UploadSurat extends Component {
 					<label className="col-md-2 col-form-label">List sanksi </label>
 					<label className="col-md-2 col-form-label">List sanksi </label>
 					<div className="col-md-10">
 					<div className="col-md-10">
 						<Select
 						<Select
-							options={this.props.listSanksi.map(e=> ({value: e, label: e}))}
+							options={this.props.listSanksi.map(e => ({ value: e, label: e }))}
 							formatOptionLabel={formatOptionLabel}
 							formatOptionLabel={formatOptionLabel}
 							isMulti
 							isMulti
 							onChange={(e) => {
 							onChange={(e) => {

+ 2 - 2
pages/pt/jawaban-keberatan/detail.js

@@ -52,7 +52,7 @@ class JawabanKeberatan extends Component {
 						</span>
 						</span>
 						<div className="ml-auto">
 						<div className="ml-auto">
 							<Link href="/pt/jawaban-keberatan">
 							<Link href="/pt/jawaban-keberatan">
-								<Button className="color-3e3a8e" color>
+								<Button className="btn-login" color>
 									<span className="font-color-white">
 									<span className="font-color-white">
 										&lt; Kembali
 										&lt; Kembali
 									</span>
 									</span>
@@ -76,7 +76,7 @@ class JawabanKeberatan extends Component {
 																Setelah membaca jawaban permohonan keberatan atas pengenaan sanksi, jika Perguruan Tinggi bermaksud mengajukan permohonan banding kepada atasan pemberi sanksi maka dapat
 																Setelah membaca jawaban permohonan keberatan atas pengenaan sanksi, jika Perguruan Tinggi bermaksud mengajukan permohonan banding kepada atasan pemberi sanksi maka dapat
 																menekan tombol di bawah ini paling lambat {moment(sanksi.data.batas_waktu.banding).format("DD MMMM YYYY")}
 																menekan tombol di bawah ini paling lambat {moment(sanksi.data.batas_waktu.banding).format("DD MMMM YYYY")}
 															</p>
 															</p>
-															<Button color className="color-3e3a8e" onClick={this.toggleModal} disabled={sanksi.data.pengajuan.banding || false}>
+															<Button color className="btn-login" onClick={this.toggleModal} disabled={sanksi.data.pengajuan.banding || false}>
 																<span className="font-color-white">
 																<span className="font-color-white">
 																	Ajukan Banding
 																	Ajukan Banding
 																</span>
 																</span>