andi 1 päivä sitten
vanhempi
commit
6af6ecf110

+ 37 - 27
components/PerpanjanganSanksi/InputTanggal.js

@@ -205,10 +205,10 @@ class InputTanggal extends Component {
                     >
                         {({ isSubmitting }) => (
                             <Form className="form-horizontal">
-                                        <FormGroup row className="mt-3">
+                                <FormGroup row className="mt-3">
                                     <label className="col-md-2 col-form-label">Sudah melakukan perpanjangan sanksi : </label>
                                     <div className="col-md-10 mt-2">{this.props.data?.riwayat_sanksi?.length}</div>
-                                    </FormGroup>
+                                </FormGroup>
                                 <FormGroup row className="mt-3">
                                     <label className="col-md-2 col-form-label">Tanggal Perpanjangan Sanksi :</label>
                                     <div className="col-md-6">
@@ -218,19 +218,22 @@ class InputTanggal extends Component {
                                                     <Field name="from_date">
                                                         {({ field, form }) => (
                                                             <Datetime
-                                                            timeFormat={false}
-                                                            inputProps={{ className: "form-control" }}
-                                                            value={field.value || "DD/MM/YYYY"}
-                                                            onChange={(from_date) => {
-                                                                form.setFieldValue(field.name, from_date);
-                                                                this.setState({ from_date })
-                                                            }}
-                                                            closeOnSelect={true}
-                                                            isValidDate={(e) => {
-                                                                return e.isBefore(new Date(this.props.data?.masa_berlaku?.to_date).getTime() + 86400000)
-                                                            }}
-
-                                                        />
+                                                                timeFormat={false}
+                                                                inputProps={{ className: "form-control" }}
+                                                                value={field.value || "DD/MM/YYYY"}
+                                                                onChange={(from_date) => {
+                                                                    form.setFieldValue(field.name, from_date);
+                                                                    this.setState({ from_date })
+                                                                }}
+                                                                closeOnSelect={true}
+                                                                isValidDate={(e) => {
+                                                                    return e.isBefore(new Date(this.props.data?.masa_berlaku?.to_date).getTime() + 86400000)
+                                                                }}
+                                                                viewDate={
+                                                                    this.props.data?.masa_berlaku?.to_date
+                                                                        ? moment(this.props.data.masa_berlaku.to_date)
+                                                                        : moment()
+                                                                } />
                                                         )}
                                                     </Field>
                                                     <ErrorMessage name="from_date" component="div" className="form-text text-danger" />
@@ -241,18 +244,25 @@ class InputTanggal extends Component {
                                                     <Field name="to_date">
                                                         {({ field, form }) => (
                                                             <Datetime
-                                                            timeFormat={false}
-                                                            inputProps={{ className: "form-control" }}
-                                                            value={field.value || "DD/MM/YYYY"}
-                                                            onChange={(to_date) => {
-                                                                form.setFieldValue(field.name, to_date);
-                                                                this.setState({ to_date })
-                                                            }}
-                                                            closeOnSelect={true}
-                                                            isValidDate={(e) => {
-                                                                return e.isBefore(addMonths(new Date(this.state.from_date), 6)) && e.isAfter(new Date(this.state.from_date))
-                                                            }}
-                                                        />
+                                                                timeFormat={false}
+                                                                inputProps={{ className: "form-control" }}
+                                                                value={field.value || "DD/MM/YYYY"}
+                                                                onChange={(to_date) => {
+                                                                    form.setFieldValue(field.name, to_date);
+                                                                    this.setState({ to_date })
+                                                                }}
+                                                                closeOnSelect={true}
+                                                                isValidDate={(e) => {
+                                                                    return e.isBefore(addMonths(new Date(this.state.from_date), 6)) && e.isAfter(new Date(this.state.from_date))
+                                                                }}
+                                                                viewDate={
+                                                                    this.state.from_date
+                                                                        ? new Date(this.state.from_date)
+                                                                        : new Date()
+                                                                }
+
+
+                                                            />
                                                         )}
                                                     </Field>
                                                     <ErrorMessage name="to_date" component="div" className="form-text text-danger" />

+ 2 - 2
components/Sanksi/BeritaAcara.js

@@ -599,7 +599,7 @@ class BeritaAcara extends Component {
                         }
                         {ENV === "production" &&
                             <CopyToClipboard
-                                text={`https://sidali.kemdikbud.go.id/signature/pleno-sanksi/${dataLaporan.data?._id}`}
+                                text={`https://sidali.kemdiktisaintek.go.id/signature/pleno-sanksi/${dataLaporan.data?._id}`}
                                 options={{ asHtml: true }}
                             >
                                 <div>
@@ -620,7 +620,7 @@ class BeritaAcara extends Component {
                         }
                         {ENV === "development" &&
                             <CopyToClipboard
-                                text={`https://dev.sidali.kemdikbud.go.id/signature/pleno-sanksi/${dataLaporan.data?._id}`}
+                                text={`https://dev-sidali.kemdiktisaintek.go.id/signature/pleno-sanksi/${dataLaporan.data?._id}`}
                                 options={{ asHtml: true }}
                             >
                                 <div>

+ 2 - 2
components/Sanksi/Modul.js

@@ -91,7 +91,7 @@ class Modul extends Component {
                 }
                 {ENV === "production" &&
                     <CopyToClipboard
-                        text={`https://sidali.kemdikbud.go.id/signature/modul/${dataLaporan.data?._id}`}
+                        text={`https://sidali.kemdiktisaintek.go.id/signature/modul/${dataLaporan.data?._id}`}
                         options={{ asHtml: true }}
                     >
                         <div>
@@ -112,7 +112,7 @@ class Modul extends Component {
                 }
                 {ENV === "development" &&
                     <CopyToClipboard
-                        text={`https://dev.sidali.kemdikbud.go.id/signature/modul/${dataLaporan.data?._id}`}
+                        text={`https://dev-sidali.kemdiktisaintek.go.id/signature/modul/${dataLaporan.data?._id}`}
                         options={{ asHtml: true }}
                     >
                         <div>

+ 42 - 1
components/Sanksi/TableLaporan.js

@@ -59,7 +59,7 @@ function TableLaporan({ listData }) {
 													</div>
 												</div>
 											</td>
-											<td>
+											{/* <td>
 												{data.sanksi?.masa_berlaku ? (
 													new Date(data.sanksi?.masa_berlaku.to_date).getTime() + 86400000 > Date.now() ? <div className="badge badge-primary">Berlaku</div> : <div className="badge badge-red">Tidak berlaku</div>
 												) : ""}
@@ -75,6 +75,47 @@ function TableLaporan({ listData }) {
 													</div>
 												)}
 
+											</td> */}
+										<td>
+    {data?.sanksi && (
+        data.sanksi?.masa_berlaku?.to_date ? (
+            <>
+                {new Date(data.sanksi.masa_berlaku.to_date).getTime() + 86400000 > Date.now() ? (
+                    <div className="badge badge-primary">Berlaku</div>
+                ) : (
+                    <div className="badge badge-red">Tidak berlaku</div>
+                )}
+
+                <p>
+                    <span className="m-0">
+                        {moment(data.sanksi.masa_berlaku.from_date).format("DD MMMM YYYY")}
+                        {" - "}
+                        {moment(data.sanksi.masa_berlaku.to_date).format("DD MMMM YYYY")}
+                    </span>
+                </p>
+            </>
+        ) : (
+            <p>
+                <span className="m-0">6 Bulan</span>
+            </p>
+        )
+    )}
+</td>
+
+											<td>
+												{data?.sanksi ? (
+													<>
+														<div className="badge badge-green">Sudah ditetapkan</div>
+
+														{data?.sanksi?.levelSanksi && (
+															<div className={sanksiMap[data.sanksi.levelSanksi]?.className}>
+																Sanksi Administratif : {sanksiMap[data.sanksi.levelSanksi]?.label}
+															</div>
+														)}
+													</>
+												) : (
+													<div className="badge badge-red">Belum ditetapkan</div>
+												)}
 											</td>
 											<td>
 												<div className="ml-auto">

+ 1 - 0
pages/app/turun-sanksi/detail.js

@@ -43,6 +43,7 @@ class Detail extends Component {
 	render() {
 		const { files, sanksi, pt, listSanksi } = this.state;
 		const { query, token } = this.props;
+		console.log(sanksi)
 		return (
 			<ContentWrapper unwrap>
 				{/* <Header /> */}