memperbaiki conflicts --> add feature Data Proses Penawaran

This commit is contained in:
Andy Chaerudin
2024-10-09 20:36:30 +07:00
43 changed files with 3990 additions and 1275 deletions

View File

@@ -5,8 +5,8 @@
$(document).ready(function() {
prepareForm();
});
function prepareForm()
function prepareForm()
{
$("#registrasi_form")[0].reset();
$(":radio[name='{{ $route[0] }}_tindakan'][value='0']").attr('checked', 'checked');
@@ -16,8 +16,8 @@
// prepare data
setData();
}
function setData()
function setData()
{
let id = $("#id").val();
let token = "{{ csrf_token() }}";
@@ -53,20 +53,20 @@
function setRegionList(datas, cid)
{
$('#{{$route[0]}}_region').empty().append('<option value="0"> - Pilih Region - </option>');
$('#{{$route[0]}}_region').empty().append('<option value="0"> - Pilih Region - </option>');
$.each(datas, function(key, value){
$('#{{$route[0]}}_region').append(new Option(value, key));
});
}
function setJenisPenilaianList(datas, cid)
{
$('#{{$route[0]}}_jenis_penilaian').empty().append('<option value="0"> - Pilih Jenis Penilaian - </option>');
$('#{{$route[0]}}_jenis_penilaian').empty().append('<option value="0"> - Pilih Jenis Penilaian - </option>');
$.each(datas, function(key, value){
$('#{{$route[0]}}_jenis_penilaian').append(new Option(value, key));
});
}
@@ -85,7 +85,7 @@
}
else
{
$("#{{$route[0]}}_jenis_penilaian option[value=0]").prop('selected', true);
$("#{{$route[0]}}_jenis_penilaian option[value=0]").prop('selected', true);
$("#{{ $route[0] }}_div_jenis_pilihan").hide();
$("#{{ $route[0] }}_div_catatan").show();
}
@@ -95,8 +95,8 @@
e.preventDefault();
//define variable
let token = "{{ csrf_token() }}";
let token = "{{ csrf_token() }}";
let _method = $('input[name=_method]').val();
let id = $('#{{$route[0]}}_id').val();
let tindakan = $('input[name="{{$route[0]}}_tindakan"]:checked').val();
@@ -108,7 +108,7 @@
jenis_penilaian='';
if(region==0)
region='';
var input_data = new Object();
input_data._token= token;
input_data._method= _method;
@@ -117,7 +117,7 @@
input_data.jenis_penilaian= jenis_penilaian;
input_data.region= region;
input_data.catatan = catatan;
let useURL= '{{ route($route[0].'.update', $id) }}';
$.ajax({
url: useURL,
@@ -128,7 +128,7 @@
beforeSend: function() {
},
success: function(response) {
removeErrorCssMsg();
if ('error' == response.status) {
$.each(response.message, function(index, value) {
@@ -137,25 +137,25 @@
$("#{{$route[0]}}_catatan").addClass(" border-danger");
$("#{{$route[0]}}_catatan_msg").text(value);
}
if ("jenis_penilaian" === index) {
$("#{{$route[0]}}_jenis_penilaian").addClass(" border-danger");
$("#{{$route[0]}}_jenis_penilaian_msg").text(value);
}
if ("region" === index) {
$("#{{$route[0]}}_region").addClass(" border-danger");
$("#{{$route[0]}}_region_msg").text(value);
}
});
}
else
}
else
{
toastr.success(response.message);
var url = "{{ route('registrasi.index') }}";
//toastr.success(response.message);
var url = "{{ route('registrasi.index') }}";
$(location).attr('href',url);
}
},
error: function(response, textStatus, errorThrown) {
// var errors = response.responseJSON.errors;
@@ -168,15 +168,15 @@
}
});
//
});
//
});
$('#{{$route[0]}}_jenis_penilaian').on('change', function (e) {
var idNya = $('#{{$route[0]}}_jenis_penilaian').find(":selected").val();
// var textNya = $('#{{$route[0]}}_jenis_penilaian').find(":selected").text();
if('1'==idNya)
{
// INTERNAL, show region
@@ -188,11 +188,11 @@
$("#{{ $route[0] }}_div_region").hide();
}
});
/*
$('#{{$route[0]}}_jenis_penilaian').on('change', function() {
console.log( this.value );
});
*/
</script>
@endpush
@endpush

View File

@@ -1,16 +1,16 @@
@push('scripts')
<script type="module">
<script type="module">
$(document).ready(function() {
prepareForm();
});
function prepareForm()
function prepareForm()
{
setData();
}
function setData()
function setData()
{
let id = $("#id").val();
let token = "{{ csrf_token() }}";
@@ -45,17 +45,17 @@
function setJenisPenilaianList(datas, cid)
{
$('#{{$route[0]}}_jenis_penilaian').empty().append('<option value="0"> - Pilih Jenis Penilaian - </option>');
$('#{{$route[0]}}_jenis_penilaian').empty().append('<option value="0"> - Pilih Jenis Penilaian - </option>');
$.each(datas, function(key, value){
$('#{{$route[0]}}_jenis_penilaian').append(new Option(value, key));
});
}
$('input[type=radio][name={{ $route[0] }}_tindakan]').change(function() {
removeErrorCssMsg();
if($(this).val()==0)
{
// show jenis pilihan
@@ -66,7 +66,7 @@
}
else
{
$("#{{$route[0]}}_jenis_penilaian option[value=0]").prop('selected', true);
$("#{{$route[0]}}_jenis_penilaian option[value=0]").prop('selected', true);
$("#{{ $route[0] }}_div_jenis_pilihan").hide();
$("#{{ $route[0] }}_div_catatan").show();
}
@@ -76,8 +76,8 @@
e.preventDefault();
//define variable
let token = "{{ csrf_token() }}";
let token = "{{ csrf_token() }}";
let _method = $('input[name=_method]').val();
let id = $('#{{$route[0]}}_id').val();
let tindakan = $('input[name="{{$route[0]}}_tindakan"]:checked').val();
@@ -86,7 +86,7 @@
if(jenis_penilaian==0)
jenis_penilaian='';
var input_data = new Object();
input_data._token= token;
input_data._method= _method;
@@ -94,7 +94,7 @@
input_data.tindakan= tindakan;
input_data.jenis_penilaian= jenis_penilaian;
input_data.catatan = catatan;
let useURL= '{{ route($route[0].'.update', $id) }}';
$.ajax({
url: useURL,
@@ -105,7 +105,7 @@
beforeSend: function() {
},
success: function(response) {
removeErrorCssMsg();
if ('error' == response.status) {
$.each(response.message, function(index, value) {
@@ -114,20 +114,20 @@
$("#{{$route[0]}}_catatan").addClass(" border-danger");
$("#{{$route[0]}}_catatan_msg").text(value);
}
if ("jenis_penilaian" === index) {
$("#{{$route[0]}}_jenis_penilaian").addClass(" border-danger");
$("#{{$route[0]}}_jenis_penilaian_msg").text(value);
}
});
}
else
}
else
{
toastr.success(response.message);
var url = "{{ route('registrasi.index') }}";
var url = "{{ route('registrasi.index') }}";
$(location).attr('href',url);
}
},
error: function(response, textStatus, errorThrown) {
// var errors = response.responseJSON.errors;
@@ -140,9 +140,9 @@
}
});
//
});
//
});
</script>
@endpush
@endpush