Merge branch 'master' of http://118.98.227.82:50006/appsptb/ptb-fe

components/Layout/MenuLLDIKTI.js

@@ -43,12 +43,6 @@ const Menu = [
 		icon: "icon-hourglass",
 		translate: "sidebar.nav.KEBERATAN",
 	},
-	{
-		name: "Banding",
-		path: "/app/banding",
-		icon: "icon-directions",
-		translate: "sidebar.nav.BANDING",
-	},
 	{
 		name: "Pemantauan Perbaikan",
 		path: "/app/perbaikan",

components/Main/Login.js

@@ -118,13 +118,7 @@ class Login extends Component {
             ></img>
             <b>Login Menggunakan Akun PDDIKTI </b>
           </h5>
-          {this.state.error && <div style={{
-            backgroundColor: '#f8d7da',
-            padding: '5px',
-            borderRadius: '3px'
-          }}>
-            <span className=" text-bold">{this.state.error}</span>
-          </div>}
+          {this.state.error}
           <form onSubmit={this.onSubmit} method="post" name="formLogin">
             <div className="form-group">
               <label className="col-form-label">
@@ -139,7 +133,7 @@ class Login extends Component {
                 value={this.state.formLogin.username}
               />
               {this.hasError("formLogin", "username", "required") && (
-                <span className="invalid-feedback">Wajib diisi</span>
+                <span className="invalid-feedback">Field is required</span>
               )}
             </div>
             <div className="form-group">
@@ -155,7 +149,7 @@ class Login extends Component {
                 data-validate='["required"]'
                 value={this.state.formLogin.password}
               />
-              <span className="invalid-feedback">Wajib diisi</span>
+              <span className="invalid-feedback">Field is required</span>
             </div>
             {/* <div className="required">* Required fields</div>
 						<span>Login Menggunakan Akun PDDIKTI</span> */}

components/NaikSanksi/InputTanggal.js

@@ -205,9 +205,9 @@ class InputTanggal extends Component {
                         {() => (
                             <Form className="form-horizontal">
                                 <FormGroup row>
-                                    <label className="col-md-2 col-form-label">Nomor Surat</label>
+                                    <label className="col-md-2 col-form-label">Nomor Sanksi</label>
                                     <div className="col-md-10">
-                                        <Field name="no_sanksi">{({ field }) => <Input type="textarea" placeholder="Nomor Surat" {...field} />}</Field>
+                                        <Field name="no_sanksi">{({ field }) => <Input type="textarea" placeholder="Nomor Sanksi" {...field} />}</Field>
                                         <ErrorMessage name="no_sanksi" component="div" className="form-text text-danger" />
                                     </div>
                                 </FormGroup>

components/Penjadwalan/CaseProgress.js

@@ -106,7 +106,8 @@ function CaseProgress({ data, nextButton, prevButton, tahun, excelSemua, excelMe
 					<Button className="float-left button-hidden icon-next" onClick={nextButton}>
 						<img src="/static/img/next.png"></img>
 					</Button>
-					<b className="text-tahun">Tahun {tahun}</b>
+					<b className="text-tahun">Tahun {tahun} </b>
+					<b className="text-tahun">Tahun {tahun} </b>
 					<Dropdown className="float-right">
 						<Dropdown.Toggle variant="success" id="dropdown-basic">
 							Unduh

components/TurunSanksi/InputTanggal.js

@@ -205,9 +205,9 @@ class InputTanggal extends Component {
                         {() => (
                             <Form className="form-horizontal">
                                 <FormGroup row>
-                                    <label className="col-md-2 col-form-label">Nomor Surat</label>
+                                    <label className="col-md-2 col-form-label">Nomor Sanksi</label>
                                     <div className="col-md-10">
-                                        <Field name="no_sanksi">{({ field }) => <Input type="textarea" placeholder="Nomor Surat" {...field} />}</Field>
+                                        <Field name="no_sanksi">{({ field }) => <Input type="textarea" placeholder="Nomor Sanksi" {...field} />}</Field>
                                         <ErrorMessage name="no_sanksi" component="div" className="form-text text-danger" />
                                     </div>
                                 </FormGroup>

pages/app/pemantauan/timeline.js

@@ -32,16 +32,15 @@ class Pemantauan extends Component {
 	componentDidMount = async () => {
 		const { query, token } = this.props;
 		const ptId = query.ptId;
-		const pelaporan = await getPelaporan(token, { pt_id: ptId, all: true, aktif: true });
+		const pelaporan = await getPelaporan(token, { pt_id: ptId, all: true, aktif: false });
 		const pt = await getOnePT(token, ptId);
 		this.setState({ pelaporan, pt });
-
 	};
 
 	handleLihatPemantaun = async (e, id_laporan) => {
 		const { token } = this.props;
 		const log = await getLog(token, id_laporan);
-		const detailLaporanPt = await getOneLaporan(token, id_laporan, { all: true, aktif: true });
+		const detailLaporanPt = await getOneLaporan(token, id_laporan, { all: true, aktif: false });
 		this.setState({ detailLaporanPt, log });
 	};
 

pages/app/perpanjangan-sanksi/index.js

@@ -23,6 +23,7 @@ class PerpanjanganSanksi extends Component {
 		const pelaporan = await getPelaporan(token, { sanksi: true });
 		const sanksi = await getSanksi(token)
 		this.setState({ pelaporan, sanksi });
+		console.log(this.state.sanksi)
 	};
 
 	render() {