diff --git a/salaryman/app/controllers/IndexController.php b/salaryman/app/controllers/IndexController.php index 4589825dbf1ddff9ed31b5ce04b0ffa48e9dc0e6..43417a31be6c46b77b6567d2c10113c1538d37c0 100644 --- a/salaryman/app/controllers/IndexController.php +++ b/salaryman/app/controllers/IndexController.php @@ -26,7 +26,7 @@ class IndexController extends ControllerBase if ($this->session->role == "pegawai"){ $this->assets ->addJs('js/bootstrap-datepicker/js/bootstrap-datepicker.min.js') - ->addJs('js/salaryman/look.js'); + ->addJs('js/salaryman/show.js'); $this->assets ->addCss('css/salaryman/statistics.css') diff --git a/salaryman/app/views/index/look.volt b/salaryman/app/views/index/look.volt index e0fdf7f7a98c9c0df39b9ab932009253d6487bce..2b16b550a0b71cae8e6e2e2fcb39f14cd4454e72 100644 --- a/salaryman/app/views/index/look.volt +++ b/salaryman/app/views/index/look.volt @@ -40,7 +40,7 @@ </tr> <tr> <td>Tunjangan Performansi</td> - <td>Rp {{ salary.tunjangan_performansi }} ({{ "Biasa" }})</td> + <td>Rp {{ salary.tunjangan_performansi }}</td> </tr> <tr> <td>Tunjangan Pasangan (Suami / Istri)</td> @@ -48,7 +48,7 @@ </tr> <tr> <td>Tunjangan Anak</td> - <td>Rp {{ salary.tunjangan_anak }} ({{ 0 }} Anak)</td> + <td>Rp {{ salary.tunjangan_anak }}</td> </tr> <tr> <td>Tunjangan Beras</td> diff --git a/salaryman/app/views/index/show.volt b/salaryman/app/views/index/show.volt index 61856562d0aa7ba3b2bbe1ebbc124ba578760ecc..ce27f97dc0b7f2dd8bbd839726aa155b0976041a 100644 --- a/salaryman/app/views/index/show.volt +++ b/salaryman/app/views/index/show.volt @@ -2,6 +2,17 @@ <div class="wrapper-lg bg-light"> <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="panel panel-default"> <div class="panel-heading font-bold" style="color:#009688 !important; font-size:1.3em"> @@ -21,7 +32,7 @@ </tr> <tr> <td>Tunjangan Performansi</td> - <td>Rp {{ salary.tunjangan_performansi }} ({{ "Biasa" }})</td> + <td>Rp {{ salary.tunjangan_performansi }}</td> </tr> <tr> <td>Tunjangan Pasangan (Suami / Istri)</td> @@ -29,7 +40,7 @@ </tr> <tr> <td>Tunjangan Anak</td> - <td>Rp {{ salary.tunjangan_anak }} ({{ 0 }} Anak)</td> + <td>Rp {{ salary.tunjangan_anak }}</td> </tr> <tr> <td>Tunjangan Beras</td> diff --git a/salaryman/public/js/salaryman/show.js b/salaryman/public/js/salaryman/show.js new file mode 100644 index 0000000000000000000000000000000000000000..070e0b44f27de7c31eccc9a087daee55f54510d1 --- /dev/null +++ b/salaryman/public/js/salaryman/show.js @@ -0,0 +1,13 @@ +$('.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