modul : bug dan revisi import karyawan

status : selesai
keterangan :
- jika tanggal lahir 1970-01-01, tgl lahir tampilkan -
- jenis kelamin wajib diisi

application/controllers/Karyawan_import.php

@@ -100,14 +100,14 @@ class Karyawan_import extends MY_Controller {
         $excel->setActiveSheetIndex(0)->setCellValue('G3', "KODE CABANG");
         $excel->setActiveSheetIndex(0)->setCellValue('H3', "KODE DEPARTEMEN");
         $excel->setActiveSheetIndex(0)->setCellValue('I3', "STATUS(KONTRAK/TETAP)"); 
-        $excel->setActiveSheetIndex(0)->setCellValue('J3', "TANGGAL AKTIF BEKERJA"); 
-        $excel->setActiveSheetIndex(0)->setCellValue('K3', "TANGGAL BERHENTI BEKERJA");
+        $excel->setActiveSheetIndex(0)->setCellValue('J3', "TANGGAL AKTIF BEKERJA(DD-MM-YYYY)"); 
+        $excel->setActiveSheetIndex(0)->setCellValue('K3', "TANGGAL BERHENTI BEKERJA(DD-MM-YYYY)");
         $excel->setActiveSheetIndex(0)->setCellValue('L3', "USERNAME");
         $excel->setActiveSheetIndex(0)->setCellValue('M3', "PASSWORD");
         $excel->setActiveSheetIndex(0)->setCellValue('N3', "SALDO CUTI");
         $excel->setActiveSheetIndex(0)->setCellValue('O3', "JENIS KELAMIN(L/P)");  
         $excel->setActiveSheetIndex(0)->setCellValue('P3', "TEMPAT LAHIR");
-        $excel->setActiveSheetIndex(0)->setCellValue('Q3', "TANGGAL LAHIR");      
+        $excel->setActiveSheetIndex(0)->setCellValue('Q3', "TANGGAL LAHIR(DD-MM-YYYY)");
         $excel->setActiveSheetIndex(0)->setCellValue('R3', "ALAMAT"); 
         $excel->setActiveSheetIndex(0)->setCellValue('S3', "AGAMA"); 
         $excel->setActiveSheetIndex(0)->setCellValue('T3', "TELEPON"); 
@@ -375,10 +375,25 @@ class Karyawan_import extends MY_Controller {
                 }
             }
 
+            if ($field->tgl_lahir == '1970-01-01') {
+                $tgl_lahir = '-';
+            }else{
+                $tgl_lahir = date('d-m-Y', strtotime($field->tgl_lahir));
+            }
+
             $row[] = $field->jatah_cuti;
-            $row[] = (($field->jenis_kelamin == 'L')?"Laki-laki":"Perempuan");
+
+            if ($field->jenis_kelamin =="" || $field->jenis_kelamin == NULL) {
+                $class = "badge badge-danger";
+                $jenis_kelamin = "Data Kosong";
+                $row[] = "<div class='".$class."'>".$jenis_kelamin."</div>";
+            }else{
+                $jenis_kelamin = (($field->jenis_kelamin == 'L')?"Laki-laki":"Perempuan");
+                $row[] = $jenis_kelamin;
+            }
+
             $row[] = $field->tempat_lahir;
-            $row[] = date('d-m-Y', strtotime($field->tgl_lahir));
+            $row[] = $tgl_lahir;
             $row[] = $field->alamat_domisili;
             $row[] = $field->agama;
             $row[] = $field->telepon;
@@ -456,14 +471,14 @@ class Karyawan_import extends MY_Controller {
             $row[3]["G"] != "KODE CABANG" OR
             $row[3]["H"] != "KODE DEPARTEMEN" OR
             $row[3]["I"] != "STATUS(KONTRAK/TETAP)" OR
-            $row[3]["J"] != "TANGGAL AKTIF BEKERJA" OR
-            $row[3]["K"] != "TANGGAL BERHENTI BEKERJA" OR
+            $row[3]["J"] != "TANGGAL AKTIF BEKERJA(DD-MM-YYYY)" OR
+            $row[3]["K"] != "TANGGAL BERHENTI BEKERJA(DD-MM-YYYY)" OR
             $row[3]["L"] != "USERNAME" OR
             $row[3]["M"] != "PASSWORD" OR
             $row[3]["N"] != "SALDO CUTI" OR
             $row[3]["O"] != "JENIS KELAMIN(L/P)" OR
             $row[3]["P"] != "TEMPAT LAHIR" OR
-            $row[3]["Q"] != "TANGGAL LAHIR" OR
+            $row[3]["Q"] != "TANGGAL LAHIR(DD-MM-YYYY)" OR
             $row[3]["R"] != "ALAMAT" OR
             $row[3]["S"] != "AGAMA" OR
             $row[3]["T"] != "TELEPON" OR
@@ -497,6 +512,7 @@ class Karyawan_import extends MY_Controller {
                 $email                  = (isset($row[$i]['U']) && $row[$i]['U'] != NULL) ? $row[$i]['U'] : '';
                 $no_ktp                 = (isset($row[$i]['V']) && $row[$i]['V'] != NULL) ? $row[$i]['V'] : '';
 
+                if (!empty($nik)){
                 
                     $id_karyawan = $this->id_company.preg_replace('/[^A-Za-z0-9\-]/', '', $nik);
 
@@ -510,7 +526,7 @@ class Karyawan_import extends MY_Controller {
                     }else if(strtoupper($status_karyawan) == 'TETAP'){
                         $status = '2';
                     }else{
-                    $message = '<font color="#eb3a28"><i class="fa fa-exclamation-triangle">&nbsp;</i>Data gagal diimport, Tolong Isikan Kolom Status dengan "KONTRAK" atau "TETAP"</font>';
+                        $message = '<font color="#eb3a28"><i class="fa fa-exclamation-triangle">&nbsp;</i>Data gagal diimport, Tolong Isikan Kolom Status dengan "KONTRAK" atau "TETAP". baris '.$i.' tidak sesuai</font>';
                         return __response_save(false, array('message' => $message));
                     }
 
@@ -538,6 +554,8 @@ class Karyawan_import extends MY_Controller {
                         }else{
                             $flag = '2';
                         }
+                    }else if($jenis_kelamin =="" || $jenis_kelamin == NULL){
+                        $flag = '2';
                     }else if($username =="" || $username == NULL || $c_username !='') {
                         $flag = '2';
                     }else if($status =="" || $status == NULL){
@@ -595,6 +613,7 @@ class Karyawan_import extends MY_Controller {
                     $next_id = $last_id+1;
                     $id_temp = substr($id_temp,0,-5).sprintf("%05d", $next_id);
                 }
+            }
 
             // print_r($data_insert);
             // exit;

application/views/karyawan/home.php

@@ -97,7 +97,11 @@
                             <button class="btn btn-success"><i class="fa fa-upload"></i> Import Data Karyawan</button>
                         </a>
 
-                        <a href="<?= site_url('master/karyawan/form/tambah') ?>" class="btn_tambah btn btn-biru"><i class="fa fa-plus"></i> Tambah Data</a>
+                        <a href="<?= site_url('master/karyawan/form/tambah')?>">
+                            <button type="button" class="btn_tambah btn btn-biru">
+                                <i class="fa fa-plus"></i> Tambah Data
+                            </button>
+                        </a>
                 <?php
                     }
                 ?>