commit

components/Sanksi/UploadSurat.js

@@ -202,6 +202,12 @@ export class UploadSurat extends Component {
 						<b>{this.state.awalsanksi ? moment(this.state.awalsanksi).format("DD-MM-YYYY") : "-"}</b> hingga <b>{this.state.akhirsanksi ? moment(this.state.akhirsanksi).format("DD-MM-YYYY") : "-"}</b>
 					</div>
 				</FormGroup>
+				<FormGroup row className="mt-1">
+					<label className="col-md-2 col-form-label">TMT</label>
+					<div className="col-md-10 mt-2">
+						<b>{this.state.akhirsanksi ? moment(this.state.akhirsanksi).diff(this.state.awalsanksi, 'month') : "-"} bulan</b>
+					</div>
+				</FormGroup>
 
 
 				<FormGroup row className="mt-3">

pages/laporan/new/index.js

@@ -151,7 +151,7 @@ class App extends Component {
       data: {},
       token: "",
       loading: false,
-      disable: false,
+      disablecancel: false,
       disablekirim: false,
       disablekirim2: false,
       disablekirim3: false,
@@ -262,7 +262,6 @@ class App extends Component {
     }
 
     this.setState({ loading: true });
-    this.setState({ disable: true });
     const success = await createLaporanPublic(token, formdata);
     if (!success) {
       swal.fire({
@@ -281,7 +280,6 @@ class App extends Component {
       Router.push("/laporan/new");
     }
     this.setState({ loading: false });
-    this.setState({ disable: false });
 
   };
 
@@ -697,15 +695,13 @@ class App extends Component {
               <ModalFooter>
 
                 <Button
-                  className="btn-login"
+                  className=" float-lg-left mr-auto btn-login"
                   color
                   disabled={this.state.disablekirim3}
                   onClick={async () => {
-                    this.setState({ loading2: true })
-                    this.setState({ disablekirim2: true })
+                    this.setState({ disablekirim2: true, disablecancel: true, loading2: true })
                     await this.createLaporan(this.state.token);
-                    this.setState({ loading2: false })
-                    this.setState({ disablekirim2: false })
+                    this.setState({ disablekirim2: false, disablecancel: false, loading2: false })
 
                   }}
                 >
@@ -729,19 +725,18 @@ class App extends Component {
                 <Button
                   className="bg-danger"
                   color
-                  disabled={this.state.disable}
-                  onClick={() => this.setState({ modal: false, disablekirim: true })}
+                  disabled={this.state.disablecancel}
+                  onClick={() => this.setState({ modal: false })}
                 >
                   <span className="font-color-white">Cancel</span>
                 </Button>
                 <Button
-                  className="color-3e3a8e btn-login bg-success"
+                  className="bg-success float-lg-right"
                   color
                   disabled={this.state.disablekirim2}
                   onClick={async () => {
-                    this.setState({ disablekirim3: true })
+                    this.setState({ disablekirim3: true, disablecancel: true })
                     if (this.state.kode) {
-
                       await this.createLaporan(
                         this.state.token,
                         this.state.kode
@@ -749,7 +744,7 @@ class App extends Component {
                     } else {
                       this.setState({ error: "Kode verifikasi harus diisi" });
                     }
-                    this.setState({ disablekirim3: false })
+                    this.setState({ disablekirim3: false, disablecancel: false })
                   }}
                 >
                   <span className="font-color-white">Kirim</span>
@@ -795,9 +790,9 @@ class App extends Component {
                 <Button
                   className="bg-danger"
                   color
-                  disabled={this.state.disable}
+                  disabled={this.state.disablecancel}
                   // disabled={true}
-                  onClick={() => this.setState({ modalNotnoHP: false, disablekirim: true })}
+                  onClick={() => this.setState({ modalNotnoHP: false })}
                 >
                   <span className="font-color-white">Cancel</span>
                 </Button>
@@ -806,8 +801,10 @@ class App extends Component {
                   color
                   disabled={this.state.disablekirim}
                   onClick={async () => {
+                    this.setState({ disablecancel: true })
                     await this.createLaporan(this.state.token);
-                    // this.state.disable
+                    this.setState({ disablecancel: false })
+
                   }}
                 >
                   <span className="font-color-white">