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

Everything

parent 50940ecd
No related merge requests found
Pipeline #2793 skipped
...@@ -26,7 +26,7 @@ class IndexController extends ControllerBase ...@@ -26,7 +26,7 @@ class IndexController extends ControllerBase
if ($this->session->role == "pegawai"){ if ($this->session->role == "pegawai"){
$this->assets $this->assets
->addJs('js/bootstrap-datepicker/js/bootstrap-datepicker.min.js') ->addJs('js/bootstrap-datepicker/js/bootstrap-datepicker.min.js')
->addJs('js/salaryman/look.js'); ->addJs('js/salaryman/show.js');
$this->assets $this->assets
->addCss('css/salaryman/statistics.css') ->addCss('css/salaryman/statistics.css')
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</tr> </tr>
<tr> <tr>
<td>Tunjangan Performansi</td> <td>Tunjangan Performansi</td>
<td>Rp {{ salary.tunjangan_performansi }} ({{ "Biasa" }})</td> <td>Rp {{ salary.tunjangan_performansi }}</td>
</tr> </tr>
<tr> <tr>
<td>Tunjangan Pasangan (Suami / Istri)</td> <td>Tunjangan Pasangan (Suami / Istri)</td>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</tr> </tr>
<tr> <tr>
<td>Tunjangan Anak</td> <td>Tunjangan Anak</td>
<td>Rp {{ salary.tunjangan_anak }} ({{ 0 }} Anak)</td> <td>Rp {{ salary.tunjangan_anak }}</td>
</tr> </tr>
<tr> <tr>
<td>Tunjangan Beras</td> <td>Tunjangan Beras</td>
......
...@@ -2,6 +2,17 @@ ...@@ -2,6 +2,17 @@
<div class="wrapper-lg bg-light"> <div class="wrapper-lg bg-light">
<div class="row"> <div class="row">
<div class="col-sm-8 col-sm-offset-2 col-xs-10 col-xs-offset-1">
<div class="form-group">
<label>Pilih waktu:</label>
<div class="input-group">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text" style="padding-left:10px" class="form-control pull-right datepicker">
</div><!-- /.input group -->
</div><!-- /.form group -->
</div>
<div class="col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2 col-xs-10 col-xs-offset-1"> <div class="col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2 col-xs-10 col-xs-offset-1">
<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">
...@@ -21,7 +32,7 @@ ...@@ -21,7 +32,7 @@
</tr> </tr>
<tr> <tr>
<td>Tunjangan Performansi</td> <td>Tunjangan Performansi</td>
<td>Rp {{ salary.tunjangan_performansi }} ({{ "Biasa" }})</td> <td>Rp {{ salary.tunjangan_performansi }}</td>
</tr> </tr>
<tr> <tr>
<td>Tunjangan Pasangan (Suami / Istri)</td> <td>Tunjangan Pasangan (Suami / Istri)</td>
...@@ -29,7 +40,7 @@ ...@@ -29,7 +40,7 @@
</tr> </tr>
<tr> <tr>
<td>Tunjangan Anak</td> <td>Tunjangan Anak</td>
<td>Rp {{ salary.tunjangan_anak }} ({{ 0 }} Anak)</td> <td>Rp {{ salary.tunjangan_anak }}</td>
</tr> </tr>
<tr> <tr>
<td>Tunjangan Beras</td> <td>Tunjangan Beras</td>
......
$('.datepicker').datepicker({
format: "MM yyyy",
viewMode: "months",
minViewMode: "months"
})
.datepicker('update', new Date(year, month - 1))
.on('changeDate', function(event) {
var date = new Date(event.date)
var month = date.getMonth() + 1
var year = date.getYear() + 1900
window.location.href= "show/n/" + nip + '/y/' + year + '/m/' + month
});;
\ No newline at end of file
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