Skip to content
Snippets Groups Projects
Commit d93833e3 authored by elvanowen's avatar elvanowen
Browse files

Everything

parent b142bf4e
No related merge requests found
Pipeline #2777 skipped
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="col-xs-12"> <div class="col-xs-12">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading font-bold" style="color:#009688 !important; font-size:1.3em"> <div class="panel-heading font-bold" style="color:#009688 !important; font-size:1.3em">
Tunjangan Performansi Per Golongan Tunjangan Performansi Per Golongan Bulan
</div> </div>
<div style="padding:30px 50px"> <div style="padding:30px 50px">
<canvas id="canvas" height="100"></canvas> <canvas id="canvas" height="100"></canvas>
......
...@@ -35,18 +35,15 @@ $(function () { ...@@ -35,18 +35,15 @@ $(function () {
var randomScalingFactor = function(){ return Math.round(Math.random()*100)}; var randomScalingFactor = function(){ return Math.round(Math.random()*100)};
function generateGraph(month, year){ function generateGraph(month, year){
alert("kampret")
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: window.location.origin + "/k2/kepegawaian/salaryman/Statistics/y/" + year + "/m/" + month, url: window.location.origin + "/k2/kepegawaian/salaryman/Statistics/y/" + year + "/m/" + month,
dataType: "json", dataType: "json",
success: function(response){ success: function(response){
console.log(response) console.log(response)
alert("kampret2")
var barChartData = { var barChartData = {
labels : ["Golongan 1", "Golongan 2", "Golongan 3", "Golongan 4",], labels : ["Golongan 1", "Golongan 2", "Golongan 3", "Golongan 4"],
datasets : [ datasets : [
{ {
fillColor : ColorLuminance("#009688", -0.1), fillColor : ColorLuminance("#009688", -0.1),
...@@ -62,6 +59,12 @@ $(function () { ...@@ -62,6 +59,12 @@ $(function () {
window.myBar = new Chart(ctx).Bar(barChartData, { window.myBar = new Chart(ctx).Bar(barChartData, {
responsive : true responsive : true
}); });
var month = $("#datepicker1").data('datepicker').getFormattedDate('MM');
if (month == "") month = "May"
$('.panel-heading').text("Tunjangan Performansi Per Golongan Bulan " + month);
} }
}) })
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment