Merge branch 'master' of https://source.sidali.sixsenz.net/andifebri/PTB-fe

components/Main/Login.js

@@ -13,7 +13,7 @@ class Login extends Component {
     super(props);
     this.state = {
       /* Group each form state in an object.
-		   Property name MUST match the form name */
+       Property name MUST match the form name */
       error: null,
       formLogin: {
         username: "",
@@ -111,13 +111,13 @@ class Login extends Component {
         />
         <CardBody className="card-body">
           {" "}
-          {/* <h5 className="card-title text-left py-2 bg-gray border-radius-login"> */}
-          <img
-            className="icon-triangle"
-            src="/static/img/icon-caution.png"
-          ></img>
-          <b>Login Menggunakan Akun PDDIKTI </b>
-          {/* </h5> */}
+          <h5 className="card-title text-left py-2 bg-gray border-radius-login">
+            <img
+              className="icon-triangle"
+              src="/static/img/icon-caution.png"
+            ></img>
+            <b>Login Menggunakan Akun PDDIKTI </b>
+          </h5>
           {this.state.error}
           <form onSubmit={this.onSubmit} method="post" name="formLogin">
             <div className="form-group">

components/Maps/vector-map.scss

@@ -12,12 +12,14 @@ body {
         position: absolute;
         display: none;
         border: solid 1px $vmap-label-bg;
-        border-radius: 2px;
+        border-radius: 7px;
         background: $vmap-label-bg;
         color: white;
         padding: 3px 6px;
         opacity: 0.9;
         z-index: 1100;
+        cursor: pointer;
+        
     }
 
     .jvectormap-zoomin, .jvectormap-zoomout {

components/Riwayat/ChartData.js

@@ -1,8 +1,6 @@
 import React, { Component } from "react";
 import ContentWrapper from "@/components/Layout/ContentWrapper";
 import { Container, Row, Col, Card, CardHeader, CardBody } from "reactstrap";
-
-import Sparkline from "@/components/Common/Sparklines.js";
 import FlotChart from "@/components/Charts/Flot.js";
 import { connect } from "react-redux";
 import { getPengunjung } from "@/actions/pengunjung";

components/Riwayat/ChartDataBar.js

@@ -14,6 +14,7 @@ class ChartDataBar extends React.Component {
 			series: [
 				{
 					data: [44, 55, 41, 64, 22, 43, 21, 44, 42, 67, 43, 86, 42, 99, 131, 313],
+					name: 'jumlah laporan',
 				},
 			],
 			options: {
@@ -37,7 +38,8 @@ class ChartDataBar extends React.Component {
 						},
 					},
 				},
-				colors: ["#B2B0D2"],
+
+				colors: ['#B2B0D2'],
 				dataLabels: {
 					enabled: true,
 					offsetX: -6,
@@ -47,9 +49,10 @@ class ChartDataBar extends React.Component {
 					},
 				},
 				stroke: {
-					show: true,
+					show: false,
 					width: 1,
 					colors: ["#fff"],
+					followCursor: true,
 				},
 				tooltip: {
 					shared: true,
@@ -57,7 +60,12 @@ class ChartDataBar extends React.Component {
 				},
 				xaxis: {
 					categories: ["I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X", "XI", "XII", "XIII", "XIV", "XV", "XVI"],
+					// name: ["LLDikti I", "LLDikti II", "LLDikti III", "LLDikti IV", "LLDikti V", "LLDikti VI", "LLDikti VII", "LLDikti VIII", "LLDikti IX", "LLDikti X", "LLDikti XI", "LLDikti XII", "LLDikti XIII", "LLDikti XIV", "LLDikti XV", "LLDikti XVI"]
 				},
+				fill: {
+					colors: ['#B2B0D2'],
+				}
+
 			},
 		};
 	}

components/Riwayat/Maps.js

@@ -12,14 +12,14 @@ const defaultColors = {
 };
 
 const RegionValues = {
-    'ID_su': 11100,
-    'ID_su': 111,
-    'ID_ss': 13131,
-    'ID_la': 3131,
-    'ID_be': 313,
-    'ID_bb': 3131,
-    'ID_jk': 2212,
-    'ID_jb': 99,
+    'ID_su': 1,
+    'ID_su': 2,
+    'ID_ss': 3,
+    'ID_la': 4,
+    'ID_be': 5,
+    'ID_bb': 6,
+    'ID_jk': 2,
+    'ID_jb': 9,
     'ID_bt': 9,
     'ID_yo': 8,
     'ID_jt': 5,
@@ -51,42 +51,39 @@ const RegionValues = {
 
 const LLDIKTI = {
     'ID_su': '<h5>LLDIKTI Wilayah I</h5>',
-    'ID_ss': '<h4>LLDIKTI Wilayah II</h4>',
-    'ID_la': '<h4>LLDIKTI Wilayah II</h4>',
-    'ID_be': '<h4>LLDIKTI Wilayah II</h4>',
-    'ID_bb': '<h4>LLDIKTI Wilayah II</h4>',
-    'ID_jk': '<h4>LLDIKTI Wilayah III</h4>',
-    'ID_jb': '<h4>LLDIKTI Wilayah IV</h4>',
-    'ID_bt': '<h4>LLDIKTI Wilayah IV</h4>',
-    'ID_yo': '<h4>LLDIKTI Wilayah V</h4>',
-    'ID_jt': '<h4>LLDIKTI Wilayah VI</h4>',
-    'ID_jl': '<h4>LLDIKTI Wilayah VII</h4>',
-    'ID_ba': '<h4>LLDIKTI Wilayah VIII</h4>',
-    'ID_nb': '<h4>LLDIKTI Wilayah VIII</h4>',
-    'ID_sg': '<h4>LLDIKTI Wilayah IX</h4>',
-    'ID_sn': '<h4>LLDIKTI Wilayah IX</h4>',
-    'ID_sr': '<h4>LLDIKTI Wilayah IX</h4>',
-    'ID_sb': '<h4>LLDIKTI Wilayah X</h4>',
-    'ID_ri': '<h4>LLDIKTI Wilayah X</h4>',
-    'ID_kr': '<h4>LLDIKTI Wilayah X</h4>',
-    'ID_ja': '<h4>LLDIKTI Wilayah X</h4>',
-    'ID_ks': '<h4>LLDIKTI Wilayah XI</h4>',
-    'ID_kb': '<h4>LLDIKTI Wilayah XI</h4>',
-    'ID_ki': '<h4>LLDIKTI Wilayah XI</h4>',
-    'ID_kt': '<h4>LLDIKTI Wilayah XI</h4>',
-    'ID_ku': '<h4>LLDIKTI Wilayah XI</h4>',
-    'ID_ma': '<h4>LLDIKTI Wilayah XII</h4>',
-    'ID_mu': '<h4>LLDIKTI Wilayah XII</h4>',
-    'ID_ac': '<h4>LLDIKTI Wilayah XIII</h4>',
-    'ID_pa': '<h4>LLDIKTI Wilayah XIV</h4>',
-    'ID_pb': '<h4>LLDIKTI Wilayah XIV</h4>',
-    'ID_nt': '<h4>LLDIKTI Wilayah XV</h4>',
-    'ID_go': '<h4>LLDIKTI Wilayah XVI</h4>',
-    'ID_st': '<h4>LLDIKTI Wilayah XVI</h4>',
-    'ID_sa': '<h4>LLDIKTI Wilayah XVI</h4>',
-
-
-
+    'ID_ss': '<h5>LLDIKTI Wilayah II</h5>',
+    'ID_la': '<h5>LLDIKTI Wilayah II</h5>',
+    'ID_be': '<h5>LLDIKTI Wilayah II</h5>',
+    'ID_bb': '<h5>LLDIKTI Wilayah II</h5>',
+    'ID_jk': '<h5>LLDIKTI Wilayah III</h5>',
+    'ID_jb': '<h5>LLDIKTI Wilayah IV</h5>',
+    'ID_bt': '<h5>LLDIKTI Wilayah IV</h5>',
+    'ID_yo': '<h5>LLDIKTI Wilayah V</h5>',
+    'ID_jt': '<h5>LLDIKTI Wilayah VI</h5>',
+    'ID_jl': '<h5>LLDIKTI Wilayah VII</h5>',
+    'ID_ba': '<h5>LLDIKTI Wilayah VIII</h5>',
+    'ID_nb': '<h5>LLDIKTI Wilayah VIII</h5>',
+    'ID_sg': '<h5>LLDIKTI Wilayah IX</h5>',
+    'ID_sn': '<h5>LLDIKTI Wilayah IX</h5>',
+    'ID_sr': '<h5>LLDIKTI Wilayah IX</h5>',
+    'ID_sb': '<h5>LLDIKTI Wilayah X</h5>',
+    'ID_ri': '<h5>LLDIKTI Wilayah X</h5>',
+    'ID_kr': '<h5>LLDIKTI Wilayah X</h5>',
+    'ID_ja': '<h5>LLDIKTI Wilayah X</h5>',
+    'ID_ks': '<h5>LLDIKTI Wilayah XI</h5>',
+    'ID_kb': '<h5>LLDIKTI Wilayah XI</h5>',
+    'ID_ki': '<h5>LLDIKTI Wilayah XI</h5>',
+    'ID_kt': '<h5>LLDIKTI Wilayah XI</h5>',
+    'ID_ku': '<h5>LLDIKTI Wilayah XI</h5>',
+    'ID_ma': '<h5>LLDIKTI Wilayah XII</h5>',
+    'ID_mu': '<h5>LLDIKTI Wilayah XII</h5>',
+    'ID_ac': '<h5>LLDIKTI Wilayah XIII</h5>',
+    'ID_pa': '<h5>LLDIKTI Wilayah XIV</h5>',
+    'ID_pb': '<h5>LLDIKTI Wilayah XIV</h5>',
+    'ID_nt': '<h5>LLDIKTI Wilayah XV</h5>',
+    'ID_go': '<h5>LLDIKTI Wilayah XVI</h5>',
+    'ID_st': '<h5>LLDIKTI Wilayah XVI</h5>',
+    'ID_sa': '<h5>LLDIKTI Wilayah XVI</h5>',
 }
 
 class Maps extends Component {
@@ -132,10 +129,11 @@ class Maps extends Component {
                     'stroke-opacity': 1
                 },
                 hover: {
-                    'fill-opacity': 0.8
+                    'fill-opacity': 0.5,
+                    cursor: 'pointer'
                 },
                 selected: {
-                    fill: 'blue'
+                    fill: 'yellow'
                 },
                 selectedHover: {}
             },