Update janasimulasi function, add split function

This commit is contained in:
Amir
2022-10-26 03:57:03 +08:00
parent 96fb6ebfbe
commit f37b2181da
16 changed files with 1079 additions and 150 deletions
@@ -287,6 +287,9 @@
<li class="{{ (request()->is('analisa/janasimulasi/*') || request()->is('analisa/janasimulasi') ) ? 'active' : '' }}">
<a href="{{url('analisa/janasimulasi')}}">Jana Simulasi</a>
</li>
<li class="{{ (request()->is('analisa/pendingdaftarsimulasi/*') || request()->is('analisa/pendingdaftarsimulasi') ) ? 'active' : '' }}">
<a href="{{url('analisa/pendingdaftarsimulasi')}}">Pending Daftar Simulasi</a>
</li>
<li class="{{ (request()->is('analisa/senaraisimulasi/*') || request()->is('analisa/senaraisimulasi') ) ? 'active' : '' }}">
<a href="{{url('analisa/senaraisimulasi')}}">Senarai Simulasi</a>
</li>
@@ -11,7 +11,7 @@
@if ($message = Session::get('failed'))
<div class="alert alert-danger">
<p>{{ $message }}</p>
{{ $message }}
</div>
@endif
<!-- <form action="{{route('analisa.janadata')}}" method="POST" enctype="multipart/form-data"> -->
@@ -0,0 +1,89 @@
@extends('layouts.app')
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-12 mx-auto">
<div class="card">
<div class="card-header">
Pending Daftar Simulasi
</div>
@if ($availableData == 1)
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
{{ $message }}
</div>
@endif
<!-- <div class="progress mb-4">
<div class="progress-bar" role="progressbar" style="width: 10%;" aria-valuenow="25" aria-valuemin="0" aria-valuemax="100"></div>
</div> -->
<div class="">
<p>Simulasi ID: {{$simulasi->id}}</p>
<p>Tarikh Lelong: {{$simulasi->tarikh_lelong}}</p>
<p>JBG: {{$simulasi->jbg}}</p>
<p>Fasa: {{$simulasi->fasa}}</p>
</div>
<div class="row text-center justify-content-center">
<div class="col-2">
<p class="badge badge-pill badge-info text-white">Read, Create Gadai</p>
<p class="badge badge-pill badge-info text-white">Create Simulasi</p>
<p class="badge badge-pill badge-info text-white">Create Caw_Simulasi</p>
<p class="badge badge-pill badge-info text-white">Create Sim_Karat</p>
</div>
<div class="col-2">
<form action="{{route('analisa.importmarhunfrommaster')}}" method="POST" enctype="multipart/form-data">
@csrf
<p class="badge badge-pill badge-info text-white">Read, Create Marhun</p>
@if ($status == 1)
<button type="submit" class="btn btn-primary">Proceed</button>
@endif
</form>
</div>
<div class="col-2">
<form action="{{route('analisa.createsimulasibid')}}" method="POST" enctype="multipart/form-data">
@csrf
<p class="badge badge-pill badge-info text-white">Create Simulasi_Bid</p>
<input type="hidden" name="tarikh_lelong" value="{{$simulasi->tarikh_lelong}}">
<input type="hidden" name="fasa" value="{{$simulasi->fasa}}">
@if ($status == 2)
<button type="submit" class="btn btn-primary">Proceed</button>
@endif
</form>
</div>
<div class="col-2">
<form action="{{route('analisa.createsimulasibidmarhun')}}" method="POST" enctype="multipart/form-data">
@csrf
<p class="badge badge-pill badge-info text-white">Create Simulasi_Bid_Marhun</p>
<input type="hidden" name="simulasi_id" value="{{$simulasi->id}}">
@if ($status == 3)
<button type="submit" class="btn btn-primary">Proceed</button>
@endif
</form>
</div>
<div class="col-2">
<form action="{{route('analisa.updatetaglel')}}" method="POST" enctype="multipart/form-data">
@csrf
<p class="badge badge-pill badge-info text-white">Update TagLel Api</p>
<input type="hidden" name="simulasi_id" value="{{$simulasi->id}}">
@if ($status == 4)
<button type="submit" class="btn btn-primary">Proceed</button>
@endif
</form>
</div>
</div>
</div>
@else
<div class="card-body">
<p>No Pending Data</p>
</div>
@endif
</div>
</div>
</div>
</div>
@endsection
@@ -7,7 +7,7 @@
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
{{ $message }}
</div>
@endif
<form id="exportform" action="" method="POST">
@@ -15,7 +15,10 @@
@endif --}}
<h3 class="pt-3" style="margin-left:1%;">Butiran Gadaian Mengikut Cawangan Lelongan Fasa {{$fasa}}</h3>
<form action="{{route('analisa.janadata')}}" method="POST" enctype="multipart/form-data">
<!-- <form action="{{route('analisa.janadata')}}" method="POST" enctype="multipart/form-data"> -->
<form action="{{route('analisa.janadata2')}}" method="POST" enctype="multipart/form-data">
<!-- <form action="{{route('analisa.importgadaifrommaster')}}" method="POST" enctype="multipart/form-data"> -->
@csrf
<input type="hidden" class="form-control" id="fasa" name="fasa" value="{{$fasa}}">
+142 -142
View File
@@ -7,14 +7,16 @@
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
<a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Simulasi</a>
<a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a>
<button type="button" class="btn btn-light"><a href="javascript:window.history.go(-1);">
<h3><i class="fas fa-arrow-alt-circle-left"></i></h3>
</a></button>
<a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Simulasi</a>
<a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a>
</div>
</nav>
<div class="tab-content" id="nav-tabContent">
</nav>
<div class="tab-content" id="nav-tabContent">
<div class="tab-pane fade show active" id="nav-simulasi" role="tabpanel" aria-labelledby="nav-simulasi-tab">
<br>
<br>
<form id="exportform" action="{{route('analisa.export')}}" method="POST">
@csrf
<input type="hidden" name="type" value="User">
@@ -35,12 +37,12 @@
<td>Keuntungan Keseluruhan : RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
</tr>
<tr>
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
<td>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp
</td>
</tr>
</table>
@@ -65,61 +67,63 @@
</div>
<table class="table table-striped table-xl" id="simulasi" style="width:100%">
<thead class="bg-primary text-white">
<tr class="text-center">
<th>No</th>
<th>Cawangan</th>
<th>Bil Marhun (Paket)</th>
<th>Berat (gm)</th>
<th>N. Marhun (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Harga Asas (RM)</th>
<th>Caj (RM)</th>
<th>Baki (RM)</th>
<th>Rugi (RM)</th>
</tr>
</thead>
<tbody>
<div class="mb-3">
<table class="table table-striped" id="simulasi" style="width:100%">
<thead class="bg-primary text-white">
<tr class="text-center">
<th>No</th>
<th>Cawangan</th>
<th>Bil Marhun (Paket)</th>
<th>Berat (gm)</th>
<th>N. Marhun (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Harga Asas (RM)</th>
<th>Caj (RM)</th>
<th>Baki (RM)</th>
<th>Rugi (RM)</th>
</tr>
</thead>
<tbody>
@foreach ($arraycaw as $index=>$caw)
<tr>
<td>{{$index+1}}</td>
<td><a href=" {{ route('analisa.senaraimarhunlel',['simulasi_id'=>$simulasi_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
<td>{{ $caw['bil_marhun'] }}</td>
<td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
<td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
<td>{{ $total_marhun }}</td>
<td>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
<td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
<td>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
<td>({{ number_format($total_rugilelong, 2, '.', ',') }})</td>
</tr>
</tfoot>
@foreach ($arraycaw as $index=>$caw)
<tr>
<td>{{$index+1}}</td>
<td><a href=" {{ route('analisa.senaraimarhunlel',['simulasi_id'=>$simulasi_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
<td>{{ $caw['bil_marhun'] }}</td>
<td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
<td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
<td>{{ $total_marhun }}</td>
<td>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
<td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
<td>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
<td>({{ number_format($total_rugilelong, 2, '.', ',') }})</td>
</tr>
</tfoot>
</table>
</table>
</div>
<table class="table table-striped table-xl" id="jumlahberat" style="width:80%">
<tr class="text-center">
<th colspan="12">JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</th>
</tr>
<tr class="text-center">
<th colspan="12">JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</th>
</tr>
</thead>
<tbody>
<tr>
@@ -140,7 +144,6 @@
<td>{{$total18K}}</td>
<td>{{$total14Kp}}</td>
<td>{{$total14K}}</td>
<td>{{$total9K}}</td>
</tr>
</tbody>
@@ -157,7 +160,7 @@
<br>
<div class="row ">
<div class="col-md-10 mx-auto ">
<button class="btn btn-primary float-right " onclick="kemaskini()" id="btnkemaskini" >Kemaskini</button>
<button class="btn btn-primary float-right " onclick="kemaskini()" id="btnkemaskini">Kemaskini</button>
<div id="hideform">
<label for="hargaasas" class="d-inline float-left pr-2 pl-2 pt-2" id="lblhargaasas">Harga Emas Per Gram (916)</label>
@@ -170,43 +173,43 @@
</div>
<div class="row ">
<div class="col-md-10 mx-auto">
<form action="{{ route('analisa.kemaskiniharga') }}" method="POST" id="formhargaasas">
@csrf
<div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
<input type="hidden" name="idsimulasi" value="{{$simulasi_id}}">
<table class="table table-striped table-xl" id="kemaskinikarat" style="width:100%" >
<thead class="bg-primary text-white">
<tr class="text-center">
<th>Karat</th>
<th>Keterangan</th>
<th>Harga</th>
</tr>
</thead>
<tbody class="text-center">
@foreach ($simkarat as $index=>$karat)
<form action="{{ route('analisa.kemaskiniharga') }}" method="POST" id="formhargaasas">
@csrf
<div id='loader'><img id="loader-image" src="../img/loadingmsg.gif" alt="Sila Tunggu Sebentar..." /></div>
<input type="hidden" name="idsimulasi" value="{{$simulasi_id}}">
<table class="table table-striped table-xl" id="kemaskinikarat" style="width:100%">
<thead class="bg-primary text-white">
<tr class="text-center">
<th>Karat</th>
<th>Keterangan</th>
<th>Harga</th>
</tr>
</thead>
<tbody class="text-center">
@foreach ($simkarat as $index=>$karat)
<tr>
<td>{{$karat->karat}}</td>
<td>{{$karat->keterangan}}</td>
<td class="input">{{$karat->harga2}}</td>
{{-- <td class="input"></td> --}}
</tr>
@endforeach
</tbody>
@endforeach
</tbody>
</table>
</table>
</div>
</div>
</div>
@if ($message = Session::get('success'))
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
{{-- {{$cawangan[0] }} --}}
</div>
<div class="modal fade" tabindex="-1" id="modalfilter">
<div class="modal-dialog modal-lg">
{{-- <div class="modal-content">
@endif
{{-- {{$cawangan[0] }} --}}
</div>
<div class="modal fade" tabindex="-1" id="modalfilter">
<div class="modal-dialog modal-lg">
{{-- <div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Filter By</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
@@ -219,7 +222,7 @@
<div class="row justify-content-center">
<div class="col-md-8">
<div class="form-group row">
<input type="hidden" name="idmarhun" id="idmarhun" >
<input type="hidden" name="idmarhun" id="idmarhun">
</div>
</div>
</div>
@@ -237,37 +240,35 @@
<script>
$("#hideform").hide();
$('#btnsimpan').prop('disabled', true)
function kemaskini() {
var inputdata = $("td.input").find("input");
if(inputdata.length ==0)
{
$("td.input").each(function(index) {
// console.log(index)
var la = $(this).html();
// if(index%2 ==0 ) //even-0-2-4
// {
$(this).html("<input type='text' name='harga2[]' id=harga2"+index+" value="+la+" />");
// }
// else //odd-1-3-5-7
// {
// $(this).html("<input type='text' name='harga[]' id=harga"+index+" value="+la+" />");
// }
})
$("#hideform").show();
$("#btnkemaskini").hide();
}
else
{
var inputdata = $("td.input").find("input");
if (inputdata.length == 0) {
$("td.input").each(function(index) {
// console.log(index)
var la = $(this).html();
// if(index%2 ==0 ) //even-0-2-4
// {
$(this).html("<input type='text' name='harga2[]' id=harga2" + index + " value=" + la + " />");
// }
// else //odd-1-3-5-7
// {
// $(this).html("<input type='text' name='harga[]' id=harga"+index+" value="+la+" />");
// }
})
$("#hideform").show();
$("#btnkemaskini").hide();
} else {
$("td.input").each(function() {
var la = $(this).html();
$(this).html($(la).val());
})
$("#hideform").hide();
$("#btnkemaskini").show();
}
}
}
function calculate(e)
{
function calculate(e) {
let hargaasasbaru = $('#txthargaasas').val();
let jeniskarat = $(e).data('jeniskarat');
@@ -276,16 +277,15 @@
let count = 0;
let indexarray = 0;
$("td.input").each(function(index) {
if(hargaasasbaru)
{
if (hargaasasbaru) {
$('#btnsimpan').prop('disabled', false)
// if(index%2 == 0)
// {
let harga1 = parseFloat(hargaasasbaru);
let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']);
let newhargaasas = harga1 + (harga2);
count++;
$('#harga2'+index).val(newhargaasas.toFixed(2));
let harga1 = parseFloat(hargaasasbaru);
let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']);
let newhargaasas = harga1 + (harga2);
count++;
$('#harga2' + index).val(newhargaasas.toFixed(2));
// }
// else
// {
@@ -299,16 +299,14 @@
// if(count == maxcolumn)
// {
// count = 0;
indexarray++;
indexarray++;
// }
}
else
{
} else {
$('#btnsimpan').prop('disabled', true)
let dummy =0;
let dummy = 0;
// if(index%2 == 0)
// {
$('#harga2'+index).val(dummy.toFixed(2));
$('#harga2' + index).val(dummy.toFixed(2));
// }
// else
// {
@@ -319,7 +317,8 @@
})
}
function save(){
function save() {
$('#formhargaasas').submit();
}
$('a.confirmdel').confirm({
@@ -330,27 +329,28 @@
buttons: {
Delete: {
btnClass: 'btn-warning',
action: function () {
action: function() {
location.href = this.$target.attr('href');
}
},
Batal: {
btnClass: 'btn-default',
action: function () {}
action: function() {}
}
}
});
var tablesimulasi = $('#simulasi').DataTable( {
"columnDefs": [
{
var tablesimulasi = $('#simulasi').DataTable({
"columnDefs": [{
"targets": 0,
"orderable": false
}
}],
order: [
[0, 'asc']
],
order: [[0, 'asc']],
"scrollX": true,
// "ordering": false,
"searching":false,
"searching": false,
"info": false,
"lengthChange": false,
"pageLength": 15,
@@ -359,10 +359,10 @@
{
className: 'btn btn-outline-danger pl-4 pr-4 btn-sm export',
titleAttr: 'Muat Turun PDF',
text: '<h8><b>PDF</b></h8>',
action: function ( e, dt, node, config ) {
$("#exportform").submit();
titleAttr: 'Muat Turun PDF',
text: '<h8><b>PDF</b></h8>',
action: function(e, dt, node, config) {
$("#exportform").submit();
}
}
]
@@ -371,15 +371,15 @@
$('.addsim').tooltip();
$('.export').tooltip();
// $( '.dt-buttons').addClass('btn-group');
$( '.addsim').removeClass('dt-button');
$( '.export').removeClass('dt-button');
$('.addsim').removeClass('dt-button');
$('.export').removeClass('dt-button');
function selectall(cb) {
tablesimulasi.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
tablesimulasi.rows().nodes().to$().find('input[type="checkbox"]').each(function() {
$(this).prop('checked', cb.checked);
})
}
</script>
@endsection
@endsection