fix online-portal skit2
This commit is contained in:
@@ -17,15 +17,17 @@
|
||||
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet">
|
||||
<!-- Extra details for Live View on GitHub Pages -->
|
||||
|
||||
<script src="{{ asset('argon') }}/vendor/jquery/dist/jquery.min.js"></script>
|
||||
|
||||
|
||||
<!-- Icons -->
|
||||
<link href="{{ asset('argon') }}/vendor/nucleo/css/nucleo.css" rel="stylesheet">
|
||||
<link href="{{ asset('argon') }}/vendor/@fortawesome/fontawesome-free/css/all.min.css" rel="stylesheet">
|
||||
<!-- Argon CSS -->
|
||||
<link type="text/css" href="{{ asset('argon') }}/css/argon.css?v=1.0.0" rel="stylesheet">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.25/b-1.7.1/b-html5-1.7.1/b-print-1.7.1/r-2.2.9/sp-1.3.0/datatables.min.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.3/css/dataTables.bootstrap4.min.css"/>
|
||||
{{-- <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.3/css/jquery.dataTables.min.css"/> --}}
|
||||
<script src="{{ asset('argon') }}/vendor/jquery/dist/jquery.min.js"></script>
|
||||
<script src="{{ asset('argon') }}/vendor/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
|
||||
|
||||
<script src="{{ asset('argon') }}/js/ifvisible.js"></script>
|
||||
@@ -36,7 +38,7 @@
|
||||
<script type="text/javascript" src="{{ asset('argon') }}/js/main.js"></script>
|
||||
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
|
||||
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
|
||||
<script type="text/javascript" src="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.25/b-1.7.1/b-html5-1.7.1/b-print-1.7.1/r-2.2.9/sp-1.3.0/datatables.min.js"></script>
|
||||
<script type="text/javascript" src="https://cdn.datatables.net/1.11.3/js/jquery.dataTables.min.js"></script>
|
||||
{{-- <script type="text/javascript" src="{{ asset('argon') }}/js/dataTables.dataTables.min.js"></script> --}}
|
||||
<link
|
||||
rel="stylesheet"
|
||||
@@ -52,10 +54,6 @@
|
||||
// console.log('sessionmodalshow');
|
||||
// });
|
||||
|
||||
if( ifvisible.now() ){
|
||||
// Display pop-up
|
||||
console.log('visible');
|
||||
}
|
||||
|
||||
</script>
|
||||
<style>
|
||||
@@ -308,8 +306,10 @@
|
||||
// timeLeft = 30;
|
||||
// });
|
||||
|
||||
$('#sessionModal').modal('show');
|
||||
|
||||
ifvisible.on("idle", function(){
|
||||
|
||||
timerId = setInterval(countdown, 1000);
|
||||
$('#sessionModal').modal('show', {backdrop: 'static', keyboard: false});
|
||||
});
|
||||
@@ -332,18 +332,16 @@
|
||||
}
|
||||
}
|
||||
|
||||
console.log(window.performance);
|
||||
|
||||
if (document.addEventListener) {
|
||||
window.addEventListener('pageshow', function (event) {
|
||||
if (event.persisted || window.performance && window.performance.navigation.type == 2)
|
||||
{
|
||||
$('#logout-form').submit();
|
||||
// location.reload();
|
||||
}
|
||||
},
|
||||
false);
|
||||
}
|
||||
// if (document.addEventListener) {
|
||||
// window.addEventListener('pageshow', function (event) {
|
||||
// if (event.persisted || window.performance && window.performance.navigation.type == 2)
|
||||
// {
|
||||
// $('#logout-form').submit();
|
||||
// // location.reload();
|
||||
// }
|
||||
// },
|
||||
// false);
|
||||
// }
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
@@ -425,6 +425,17 @@
|
||||
$("#spanbayarantawarruq").text(sumtawarruq.toFixed(2));
|
||||
$('#spanjumlah').text(formatter.format(sum));
|
||||
}
|
||||
|
||||
if (document.addEventListener) {
|
||||
window.addEventListener('pageshow', function (event) {
|
||||
if (event.persisted || window.performance && window.performance.navigation.type == 2)
|
||||
{
|
||||
$('#logout-form').submit();
|
||||
// location.reload();
|
||||
}
|
||||
},
|
||||
false);
|
||||
}
|
||||
</script>
|
||||
|
||||
@endsection
|
||||
|
||||
@@ -321,7 +321,16 @@
|
||||
|
||||
});
|
||||
|
||||
|
||||
if (document.addEventListener) {
|
||||
window.addEventListener('pageshow', function (event) {
|
||||
if (event.persisted || window.performance && window.performance.navigation.type == 2)
|
||||
{
|
||||
$('#logout-form').submit();
|
||||
// location.reload();
|
||||
}
|
||||
},
|
||||
false);
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user