Skip to content

M
master-absenku-custom
Commit 5a883147 by nurchamim
Options

modul : revisi pengajuan lembur 

status : selesai
keterangan : mengganti leaflet dengan google maps
parent 24f26034
Showing with 214 additions and 97 deletions
application/controllers/Pengajuan_lembur.php
...@@ -171,28 +171,6 @@ class Pengajuan_lembur extends MY_Controller ...@@ -171,28 +171,6 @@ class Pengajuan_lembur extends MY_Controller
} else { } else {
$kedep = $this->fungsi->get_approval($field->approval_kedep); $kedep = $this->fungsi->get_approval($field->approval_kedep);
} }
// if ($field->approval_kedep == 1) {
// $key = array_search(2, $get_lev);
// $approv = $get_lev[$key - 1];
// if ($approv == '7') {
// $approv_col = $field->approval_spv;
// }
// if ($key != 0) {
// if ($approv_col == "4") {
// $kedep = '<a href="#" id="' . md5($field->id_lemmulai) . '" class="btn_verif_kedep btn-sm btn btn-primary" title="VERIFIKASI">
// <i class="fa fa-check"> </i> VERIFIKASI</a>&nbsp;';
// } else {
// $kedep = $this->fungsi->get_approval($field->approval_kedep);
// }
// } else {
// $kedep = '<a href="#" id="' . md5($field->id_lemmulai) . '" class="btn_verif_kedep btn-sm btn btn-primary" title="VERIFIKASI">
// <i class="fa fa-check"> </i> VERIFIKASI</a>&nbsp;';
// }
// }else {
// $kedep = $this->fungsi->get_approval($field->approval_kedep);
// }
} else { } else {
$kedep = $this->fungsi->get_approval($field->approval_kedep); $kedep = $this->fungsi->get_approval($field->approval_kedep);
} }
...@@ -370,15 +348,35 @@ class Pengajuan_lembur extends MY_Controller ...@@ -370,15 +348,35 @@ class Pengajuan_lembur extends MY_Controller
->get() ->get()
->row(); ->row();
$map_mulai['nama_lengkap'] = $coords->nama_lengkap; // mulai
$map_mulai['latitude'] = $coords->latitude_mulai; $this->load->library('googlemaps/Googlemaps');
$map_mulai['longitude'] = $coords->longitude_mulai; $config=array();
$data['map_mulai'] = $this->draw_map('map_mulai', $map_mulai); $config['center']=$coords->latitude_mulai.','.$coords->longitude_mulai;
$config['zoom']=18;
$config['map_height']="400px";
$this->googlemaps->initialize($config);
$map_selesai['nama_lengkap'] = $coords->nama_lengkap; $marker=array();
$map_selesai['latitude'] = $coords->latitude_selesai; $marker['position'] =$coords->latitude_mulai.",".$coords->longitude_mulai;
$map_selesai['longitude'] = $coords->longitude_selesai; $marker['title']= $coords->nama_lengkap;
$data['map_selesai'] = $this->draw_map('map_selesai', $map_selesai); $this->googlemaps->add_marker($marker);
$data['map_mulai']=$this->googlemaps->create_map();
// selesai
$this->load->library('googlemaps2/Googlemaps2');
$config2=array();
$config2['center']=$coords->latitude_selesai.','.$coords->longitude_selesai;
$config2['zoom']=18;
$config2['map_height']="400px";
$this->googlemaps2->initialize($config2);
$marker2=array();
$marker2['position'] =$coords->latitude_selesai.",".$coords->longitude_selesai;
$marker2['title']= $coords->nama_lengkap;
$this->googlemaps2->add_marker($marker2);
$data['map_selesai']=$this->googlemaps2->create_map();
$data['data'] = $coords; $data['data'] = $coords;
...@@ -442,27 +440,7 @@ class Pengajuan_lembur extends MY_Controller ...@@ -442,27 +440,7 @@ class Pengajuan_lembur extends MY_Controller
$data['company'] = $query->nama; $data['company'] = $query->nama;
$data['id_company'] = $query->id_company; $data['id_company'] = $query->id_company;
$this->load->library('Leaflet');
$get_one = $this->db->select("latitude, longitude")->from("lembur_mulai")->where("md5(id_lemmulai)", $id)->get();
//$this->db->query("SELECT latitude, longitude FROM lembur_mulai WHERE md5(id_lemmulai) = '$id'");
if ($get_one->num_rows() > 0) {
$lat = $get_one->row()->latitude;
$long = $get_one->row()->longitude;
} else {
$lat = "-6.990581698473311";
$long = "110.42295643957527";
}
$config = array(
'center' => $lat . ',' . $long, // Center of the map
'zoom' => 15, // Map zoom
);
$this->leaflet->initialize($config);
$coords = $this->db->select("lembur_mulai.tgl_absen, lembur_mulai.jam_absen, lembur_mulai.latitude, lembur_mulai.longitude, lembur_mulai.approve, lembur_mulai.lokasi_absen, lembur_mulai.keterangan, lembur_mulai.foto, data_karyawan.nama_lengkap")->from("lembur_mulai")->join("data_karyawan", "data_karyawan.id_karyawan = lembur_mulai.id_karyawan", "left")->where("md5(id_lemmulai)", $id)->get()->row(); $coords = $this->db->select("lembur_mulai.tgl_absen, lembur_mulai.jam_absen, lembur_mulai.latitude, lembur_mulai.longitude, lembur_mulai.approve, lembur_mulai.lokasi_absen, lembur_mulai.keterangan, lembur_mulai.foto, data_karyawan.nama_lengkap")->from("lembur_mulai")->join("data_karyawan", "data_karyawan.id_karyawan = lembur_mulai.id_karyawan", "left")->where("md5(id_lemmulai)", $id)->get()->row();
//$this->db->query("SELECT lembur_mulai.tgl_absen, lembur_mulai.jam_absen, lembur_mulai.latitude, lembur_mulai.longitude, lembur_mulai.approve, lembur_mulai.lokasi_absen, lembur_mulai.keterangan, lembur_mulai.foto, data_karyawan.nama_lengkap FROM lembur_mulai JOIN data_karyawan ON data_karyawan.id_karyawan = lembur_mulai.id_karyawan WHERE md5(id_lemmulai) = '$id'")->row();
$data['nama'] = $coords->nama_lengkap; $data['nama'] = $coords->nama_lengkap;
$data['lokasi'] = $coords->lokasi_absen; $data['lokasi'] = $coords->lokasi_absen;
$data['jam_absen'] = $coords->jam_absen; $data['jam_absen'] = $coords->jam_absen;
...@@ -470,18 +448,20 @@ class Pengajuan_lembur extends MY_Controller ...@@ -470,18 +448,20 @@ class Pengajuan_lembur extends MY_Controller
$data['keterangan'] = $coords->keterangan; $data['keterangan'] = $coords->keterangan;
$data['foto'] = $coords->foto; $data['foto'] = $coords->foto;
$marker = array( if(empty($coords->longitude)){
'latlng' => $coords->latitude . ',' . $coords->longitude, // Marker Location $foto = $this->config->item('base_image').'image?_t=lokasi&_d=';
'popupContent' => $coords->nama_lengkap, // Popup Content $html = '<img src="'.$foto.'" class="portrait" style="max-height:400px">';
); $maps = ["js"=>"","html"=>$html];
$lokasi = $maps;
$this->leaflet->add_marker($marker); $data['map'] = $lokasi;
$data['map'] = $this->leaflet->create_map(); }else{
$data['lat'] = $coords->latitude;
$data['long'] = $coords->longitude;
$data['title']= "kkk";
}
// $data['menu'] = $this->load->view('main_menu', $data, true);
$this->load->view('pengajuan_lembur/peta_lembur_mulai', $data); $this->load->view('pengajuan_lembur/peta_lembur_mulai', $data);
// $this->load->view('main_template', $data, false);
} }
public function detail_lembur_selesai($id) public function detail_lembur_selesai($id)
...@@ -494,26 +474,7 @@ class Pengajuan_lembur extends MY_Controller ...@@ -494,26 +474,7 @@ class Pengajuan_lembur extends MY_Controller
$data['company'] = $query->nama; $data['company'] = $query->nama;
$data['id_company'] = $query->id_company; $data['id_company'] = $query->id_company;
$this->load->library('Leaflet');
$get_one = $this->db->select("latitude, longitude")->from("lembur_mulai")->where("md5(id_lemmulai)", $id)->get();
if ($get_one->num_rows() > 0) {
$lat = $get_one->row()->latitude;
$long = $get_one->row()->longitude;
} else {
$lat = "-6.990581698473311";
$long = "110.42295643957527";
}
$config = array(
'center' => $lat . ',' . $long, // Center of the map
'zoom' => 15, // Map zoom
);
$this->leaflet->initialize($config);
$coords = $this->db->select("lembur_selesai.tgl_absen, lembur_selesai.jam_absen, lembur_selesai.latitude, lembur_selesai.longitude, lembur_selesai.lokasi_absen, lembur_selesai.keterangan, lembur_selesai.foto, data_karyawan.nama_lengkap")->from("lembur_selesai")->join("data_karyawan", "data_karyawan.id_karyawan = lembur_selesai.id_karyawan", "left")->where("md5(id_lemselesai)", $id)->get()->row(); $coords = $this->db->select("lembur_selesai.tgl_absen, lembur_selesai.jam_absen, lembur_selesai.latitude, lembur_selesai.longitude, lembur_selesai.lokasi_absen, lembur_selesai.keterangan, lembur_selesai.foto, data_karyawan.nama_lengkap")->from("lembur_selesai")->join("data_karyawan", "data_karyawan.id_karyawan = lembur_selesai.id_karyawan", "left")->where("md5(id_lemselesai)", $id)->get()->row();
//$this->db->query("SELECT lembur_selesai.tgl_absen, lembur_selesai.jam_absen, lembur_selesai.latitude, lembur_selesai.longitude, lembur_selesai.approve, lembur_selesai.lokasi_absen, lembur_selesai.keterangan, lembur_selesai.foto, data_karyawan.nama_lengkap FROM lembur_selesai JOIN data_karyawan ON data_karyawan.id_karyawan = lembur_selesai.id_karyawan WHERE md5(id_lemselesai) = '$id'")->row();
$data['nama'] = $coords->nama_lengkap; $data['nama'] = $coords->nama_lengkap;
$data['lokasi'] = $coords->lokasi_absen; $data['lokasi'] = $coords->lokasi_absen;
$data['jam_absen'] = $coords->jam_absen; $data['jam_absen'] = $coords->jam_absen;
...@@ -521,13 +482,18 @@ class Pengajuan_lembur extends MY_Controller ...@@ -521,13 +482,18 @@ class Pengajuan_lembur extends MY_Controller
$data['keterangan'] = $coords->keterangan; $data['keterangan'] = $coords->keterangan;
$data['foto'] = $coords->foto; $data['foto'] = $coords->foto;
$marker = array( if(empty($coords->longitude)){
'latlng' => $coords->latitude . ',' . $coords->longitude, // Marker Location $foto = $this->config->item('base_image').'image?_t=lokasi&_d=';
'popupContent' => $coords->nama_lengkap, // Popup Content $html = '<img src="'.$foto.'" class="portrait" style="max-height:400px">';
); $maps = ["js"=>"","html"=>$html];
$this->leaflet->add_marker($marker); $lokasi = $maps;
$data['map'] = $lokasi;
$data['map'] = $this->leaflet->create_map(); }else{
$data['lat'] = $coords->latitude;
$data['long'] = $coords->longitude;
$data['title']= "kkk";
}
$data['content'] = $this->load->view('pengajuan_lembur/peta_lembur_selesai', $data); $data['content'] = $this->load->view('pengajuan_lembur/peta_lembur_selesai', $data);
} }
......
application/views/pengajuan_lembur/home.php
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
outline: none; outline: none;
} }
</style> </style>
<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=<?= $this->config->item('api_map_key') ?>&sensor=false"></script>
<script type="text/javascript"> <script type="text/javascript">
function validasiinput() function validasiinput()
{ {
......
application/views/pengajuan_lembur/peta_lembur_mulai.php
<?php echo $map['js']; ?>
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle"><?= ucwords(str_replace('_', ' ', $judul)) ?></h5> <h5 class="modal-title" id="exampleModalLongTitle"><?= ucwords(str_replace('_', ' ', $judul)) ?></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
...@@ -61,9 +60,7 @@ ...@@ -61,9 +60,7 @@
<div class="row"> <div class="row">
<div class="col-md-6 text-center thumbnail"> <div class="col-md-6 text-center thumbnail">
<h6>Peta Lokasi</h6> <h6>Peta Lokasi</h6>
<?php <div id="map_canvas" style="width:100%; height:400px;"></div>
echo $map['html'];
?>
</div> </div>
<div class="col-md-6 text-center thumbnail"> <div class="col-md-6 text-center thumbnail">
<h6>Gambar</h6> <h6>Gambar</h6>
...@@ -80,4 +77,82 @@ ...@@ -80,4 +77,82 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-close"></i> Tutup</button> <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-close"></i> Tutup</button>
</div> </div>
\ No newline at end of file
<script type="text/javascript">
var map;
var lat_longs_map = new Array();
var markers = []; // Create a marker array to hold your markers
var beaches = [];
var mapCentre;
function setMarkers(locations) {
for (var i = 0; i < locations.length; i++) {
var beach = locations[i];
var myLatLng = new google.maps.LatLng(beach[0], beach[1]);
var marker = new google.maps.Marker({
position: myLatLng,
map: map,
animation: google.maps.Animation.DROP,
title: beach[2],
zIndex: beach[3]
});
// Push marker to markers array
markers.push(marker);
// Push marker to lat_longs_map array
lat_longs_map.push(marker.getPosition());
}
}
function initialize() {
var varcenter = new google.maps.LatLng(-0.4183772,117.4237542);
var varZoom = 5.4;
var mapOptions = {
zoom: varZoom,
center: varcenter,
mapTypeId: google.maps.MapTypeId.ROADMAP
}
map = new google.maps.Map(document.getElementById('map_canvas'), mapOptions);
setMarkers(beaches);
fitMapToBounds_map();
}
function fitMapToBounds_map() {
var bounds = new google.maps.LatLngBounds();
if (lat_longs_map.length > 0) {
for (var i=0; i<lat_longs_map.length; i++) {
bounds.extend(lat_longs_map[i]);
}
map.fitBounds(bounds);
map.setZoom(18)
}
}
initialize();
$(function() {
for (var i=0; i<markers.length; i++) {
markers[i].setMap(null);
}
markers = []; // Reset the markers array
lat_longs_map = []; // Reset the lat_longs_map array
beaches = []; // Reset the beaches array
var arr = [];
arr.push(<?= $lat ?>);
arr.push(<?= $long ?>);
arr.push('<?= $title ?>');
arr.push(1);
beaches.push(arr);
setMarkers(beaches);
fitMapToBounds_map();
});
</script>
\ No newline at end of file
application/views/pengajuan_lembur/peta_lembur_selesai.php
<?php echo $map['js']; ?>
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle"><?= ucwords(str_replace('_', ' ', $judul)) ?></h5> <h5 class="modal-title" id="exampleModalLongTitle"><?= ucwords(str_replace('_', ' ', $judul)) ?></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
...@@ -59,14 +58,12 @@ ...@@ -59,14 +58,12 @@
<div class="row"> <div class="row">
<div class="col-md-6 text-center thumbnail"> <div class="col-md-6 text-center thumbnail">
<h6>Peta Lokasi</h6> <h6>Peta Lokasi</h6>
<?php <div id="map_canvas" style="width:100%; height:400px;"></div>
echo $map['html'];
?>
</div> </div>
<div class="col-md-6 text-center thumbnail"> <div class="col-md-6 text-center thumbnail">
<h6>Gambar</h6> <h6>Gambar</h6>
<?php <?php
$img = $this->config->item('base_image').'image?_t=image&_d='.$foto; $img = $this->config->item('base_image').'image?_t=image&_d='.$foto;
?> ?>
<img src="<?= $img; ?>" class="portrait" style="max-height:400px"> <img src="<?= $img; ?>" class="portrait" style="max-height:400px">
</div> </div>
...@@ -76,4 +73,82 @@ ...@@ -76,4 +73,82 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-close"></i> Tutup</button> <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-close"></i> Tutup</button>
</div> </div>
\ No newline at end of file
<script type="text/javascript">
var map;
var lat_longs_map = new Array();
var markers = []; // Create a marker array to hold your markers
var beaches = [];
var mapCentre;
function setMarkers(locations) {
for (var i = 0; i < locations.length; i++) {
var beach = locations[i];
var myLatLng = new google.maps.LatLng(beach[0], beach[1]);
var marker = new google.maps.Marker({
position: myLatLng,
map: map,
animation: google.maps.Animation.DROP,
title: beach[2],
zIndex: beach[3]
});
// Push marker to markers array
markers.push(marker);
// Push marker to lat_longs_map array
lat_longs_map.push(marker.getPosition());
}
}
function initialize() {
var varcenter = new google.maps.LatLng(-0.4183772,117.4237542);
var varZoom = 5.4;
var mapOptions = {
zoom: varZoom,
center: varcenter,
mapTypeId: google.maps.MapTypeId.ROADMAP
}
map = new google.maps.Map(document.getElementById('map_canvas'), mapOptions);
setMarkers(beaches);
fitMapToBounds_map();
}
function fitMapToBounds_map() {
var bounds = new google.maps.LatLngBounds();
if (lat_longs_map.length > 0) {
for (var i=0; i<lat_longs_map.length; i++) {
bounds.extend(lat_longs_map[i]);
}
map.fitBounds(bounds);
map.setZoom(18)
}
}
initialize();
$(function() {
for (var i=0; i<markers.length; i++) {
markers[i].setMap(null);
}
markers = []; // Reset the markers array
lat_longs_map = []; // Reset the lat_longs_map array
beaches = []; // Reset the beaches array
var arr = [];
arr.push(<?= $lat ?>);
arr.push(<?= $long ?>);
arr.push('<?= $title ?>');
arr.push(1);
beaches.push(arr);
setMarkers(beaches);
fitMapToBounds_map();
});
</script>
\ No newline at end of file
Markdown is supported
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