fixing riwayat dan proses sanksi

components/Riwayat/TableRiwayat.js

@@ -72,9 +72,9 @@ class TableRiwayat extends Component {
 				rows.push({
 					deskripsi: e.aktivitas,
 					complete: Math.min(100, Math.round(Math.random() * 110)),
-					ipv4: e.ipv4,
+					ipv4: e.ipv4 || "-",
 					menu: e.menu || "-",
-					username: e.user.nama,
+					username: e.user?.nama || "-",
 					timelapse: moment(e.createdAt).toLocaleString(),
 					completeDate: this.getRandomDate(new Date(), new Date(2021, 0, 1)),
 				});
@@ -103,16 +103,7 @@ class TableRiwayat extends Component {
 	render() {
 		return (
 			<ContentWrapper>
-				<Container fluid>
-					{this.state.dataGridReady && (
-						<ReactDataGrid
-							onGridSort={this.handleGridSort}
-							columns={this._columns}
-							rowGetter={this.rowGetter}
-							rowsCount={this.state.rows.length}
-						/>
-					)}
-				</Container>
+				<Container fluid>{this.state.dataGridReady && <ReactDataGrid onGridSort={this.handleGridSort} columns={this._columns} rowGetter={this.rowGetter} rowsCount={this.state.rows.length} />}</Container>
 				<div align="center">
 					<span>Riwayat Pengguna</span>
 				</div>

pages/app/sanksi/proses.js

@@ -53,6 +53,8 @@ class ProsesSanksi extends Component {
 			const formdata = new FormData();
 			formdata.append("no_sanksi", this.state.dataUpload.nomorSanksi);
 			formdata.append("keterangan", this.state.dataUpload.keterangan);
+			formdata.append("from_date", this.state.dataUpload.awalsanksi);
+			formdata.append("to_date", this.state.dataUpload.akhirsanksi);
 			formdata.append("pelanggaran_id", this.state.dataPelanggaran.data.map((e) => e._id).join());
 			if (this.state.dataUpload.files.length > 0) {
 				this.state.dataUpload.files.forEach((e) => {
@@ -98,9 +100,7 @@ class ProsesSanksi extends Component {
 						<div className="ml-auto">
 							<Link href="/app/sanksi">
 								<Button className="color-3e3a8e" color>
-									<span className="font-color-white">
-										&lt; Kembali
-									</span>
+									<span className="font-color-white">&lt; Kembali</span>
 								</Button>
 							</Link>
 						</div>
@@ -177,9 +177,7 @@ class ProsesSanksi extends Component {
 											<hr />
 											<div className="d-flex">
 												<Button className="ml-auto btn-login color-3e3a8e" color onClick={this.toggleStep("2")}>
-													<span className="font-color-white">
-														Next
-													</span>
+													<span className="font-color-white">Next</span>
 												</Button>
 											</div>
 										</TabPane>
@@ -199,14 +197,10 @@ class ProsesSanksi extends Component {
 											<hr />
 											<div className="d-flex">
 												<Button color className="btn-login color-3e3a8e" onClick={this.toggleStep("1")}>
-													<span className="font-color-white">
-														Previous
-													</span>
+													<span className="font-color-white">Previous</span>
 												</Button>
 												<Button className="ml-auto btn-login color-3e3a8e" color onClick={this.toggleStep("3")}>
-													<span className="font-color-white">
-														Next
-													</span>
+													<span className="font-color-white">Next</span>
 												</Button>
 											</div>
 										</TabPane>
@@ -218,14 +212,10 @@ class ProsesSanksi extends Component {
 											<hr />
 											<div className="d-flex">
 												<Button color className="btn-login color-3e3a8e" onClick={this.toggleStep("2")}>
-													<span className="font-color-white">
-														Previous
-													</span>
+													<span className="font-color-white">Previous</span>
 												</Button>
 												<Button className="ml-auto btn-login color-3e3a8e" color onClick={this.toggleStep("4")}>
-													<span className="font-color-white">
-														Next
-													</span>
+													<span className="font-color-white">Next</span>
 												</Button>
 											</div>
 										</TabPane>
@@ -237,14 +227,10 @@ class ProsesSanksi extends Component {
 											<hr />
 											<div className="d-flex">
 												<Button color className="btn-login color-3e3a8e" onClick={this.toggleStep("3")}>
-													<span className="font-color-white">
-														Previous
-													</span>
+													<span className="font-color-white">Previous</span>
 												</Button>
 												<Button className="ml-auto btn-login color-3e3a8e" color onClick={this.toggleStep("5")}>
-													<span className="font-color-white">
-														Next
-													</span>
+													<span className="font-color-white">Next</span>
 												</Button>
 											</div>
 										</TabPane>
@@ -256,14 +242,10 @@ class ProsesSanksi extends Component {
 											<hr />
 											<div className="d-flex">
 												<Button color className="btn-login color-3e3a8e" onClick={this.toggleStep("4")}>
-													<span className="font-color-white">
-														Previous
-													</span>
+													<span className="font-color-white">Previous</span>
 												</Button>
 												<Button className="ml-auto btn-login color-3e3a8e" color onClick={this.done}>
-													<span className="font-color-white">
-														Done
-													</span>
+													<span className="font-color-white">Done</span>
 												</Button>
 											</div>
 										</TabPane>