From ab30f16089b12c3e6042aefa6121b87b007e14b9 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 9 May 2022 11:04:04 +0800 Subject: [PATCH] fix --- resources/views/includes/home.blade.php | 62 +++++++++++++++++++------ 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php index a2f1b5a..80da34a 100644 --- a/resources/views/includes/home.blade.php +++ b/resources/views/includes/home.blade.php @@ -281,10 +281,10 @@ var hargaemastable = $('#harga_emas').DataTable({ var count = parseInt($('#totalsag').text()); var fasa = $(e).data('fasa'); if (typeof fasa !== 'undefined' || fasa !== null) { - if(fasa == 2) - { - console.log(fasa); - + if(fasa == 2){ + if ($(e).is(':checked')){ + $(e).prop('checked', false); + } return; } } @@ -493,7 +493,7 @@ var hargaemastable = $('#harga_emas').DataTable({ $('#loadertable').removeClass('d-none'); $('#formtable').addClass('d-none'); - + var empat = selepastawarruqtable.columns(3).header(); $(empat).html('T. Lelong'); @@ -517,18 +517,50 @@ var hargaemastable = $('#harga_emas').DataTable({ } }); - selepastawarruqtable.clear().draw(); + var counter = 1; + $.each(datalelong,function(index,lelong){ - selepastawarruqtable.row.add([ - ``, - namacawangan, - ps.norujukan, - ps.t_lelong, - '', - '', - '' - ]).draw(); + let namacawangan = ''; + $.ajax({ + url: api_url + '/api/cawangan/detail/' + lelong.kodcaw, + method: 'get', + async:false, + dataType: "json", + success: function(data) { + namacawangan = data[0].namacaw; + namacawangan = namacawangan.toLowerCase().substring(8).replace(/\b[a-z]/g, function(value) { + return value.toUpperCase(); + }); + } + }); + + let marhun = []; + $.ajax({ + url: api_url + '/api/marhun/' + lelong.norujukan, + method: 'get', + async:false, + dataType: "json", + success: function(response) { + // console.log(response); + for(i in response){ + marhun.push(response[i]); + } + } + }); + + selepastawarruqtable.row.add([ + ``, + namacawangan, + lelong.norujukan, + lelong.t_lelong, + '', + '', + '' + ]).draw(); + + counter = counter + 1; + }); }