Initial commit.

This commit is contained in:
Matjaz
2022-01-12 22:22:13 +01:00
parent b70040ed66
commit 5249285dbd
9 changed files with 182 additions and 161 deletions

View File

@ -12,15 +12,19 @@
<h1 id="imeorgana"><%= subjekt[0].naziv %><button type="button" id="priljubljeneGumb" class="btn btn-success btn-sm"><i class="fa fa-heart"></i> Dodaj med priljubljene</button></h1>
</div>
<%- include partial/iskalnik.ejs %>
<div class="card">
<div class="card-img-top" id="basicMap" style="height:400px">
</div><!--card-img-top-->
<div class="card-block">
<small id="oorganu">
<img src="/images/loading.gif" />
</small>
</div><!--card-block-->
</div><!-- card -->
<div class="row mb-3">
<div class="col-sm-12">
<div class="card">
<div class="card-img-top" id="basicMap" style="height:400px">
</div><!--card-img-top-->
<div class="card-body">
<small id="oorganu">
<img src="/images/loading.gif" />
</small>
</div><!--card-body-->
</div><!-- card -->
</div><!-- col-sm-12 -->
</div><!-- row -->
<% if(lokacijaJS.length > 0) { %>
<script type="text/javascript">
var iconFeatures=[];
@ -115,14 +119,14 @@
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="omejitve">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/omejitve-org.ejs %>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="narocila">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/narocila-organ.ejs %>
</div>
</div>
@ -206,7 +210,7 @@
organiArray.sort()
localStorage.setItem("organi", organiArray)
$('#opozorilo').html(
'<div class="alert alert-success alert-dismissible fade in" role="alert">'+
'<div class="alert alert-success alert-dismissible fade show" role="alert">'+
' <button type="button" class="close" data-dismiss="alert" aria-label="Close">'+
' <span aria-hidden="true">&times;</span>'+
' </button>'+
@ -215,7 +219,7 @@
);
} else {
$('#opozorilo').html(
'<div class="alert alert-info alert-dismissible fade in" role="alert">'+
'<div class="alert alert-info alert-dismissible fade show" role="alert">'+
' <button type="button" class="close" data-dismiss="alert" aria-label="Close">'+
' <span aria-hidden="true">&times;</span>'+
' </button>'+

View File

@ -16,8 +16,8 @@
</script>
<script>hljs.initHighlightingOnLoad();</script>
<!-- Bootstrap 4 core JavaScript -->
<script src="/javascripts/tether.min.js"></script><!-- tether za bootstrap ... -->
<script src="/javascripts/bootstrap.min.js"></script><!-- Bootstrap 4.0-alpha.2 -->
<!--<script src="/javascripts/tether.min.js"></script>--><!-- tether za bootstrap ... -->
<!--<script src="/javascripts/bootstrap.min.js"></script>--><!-- Bootstrap 4.0-alpha.2 -->
<!-- skripta strani -->
<script src="/javascripts/scripts.js"></script>
<!-- ChartJS -->

View File

@ -7,8 +7,13 @@
<meta name="author" content="uplink">
<title><%= title %></title>
<!-- Bootstrap 4 core CSS -->
<script src="/javascripts/jquery-2.1.4.min.js"></script>
<link rel="stylesheet" href="/stylesheets/bootstrap.min.css">
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
<!-- OpenLayers maps -->
<link rel="stylesheet" href="/stylesheets/ol.css">
<script src="/javascripts/ol.js" ></script>
@ -16,9 +21,12 @@
<link href="/stylesheets/uplink.css" rel="stylesheet">
<link rel="stylesheet" href="/stylesheets/font-awesome.min.css">
<!-- Datatables -->
<link rel="stylesheet" href="/stylesheets/dataTables.bootstrap4.min.css">
<!--<link rel="stylesheet" href="/stylesheets/dataTables.bootstrap4.min.css">
<script src="/javascripts/jquery.dataTables.min.js"></script>
<script src="/javascripts/dataTables.bootstrap4.min.js"></script>
<script src="/javascripts/dataTables.bootstrap4.min.js"></script>-->
<script src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
<script src="https://cdn.datatables.net/1.10.16/js/dataTables.bootstrap4.min.js"></script>
<link rel="stylesheet" href="https://cdn.datatables.net/1.10.16/css/dataTables.bootstrap4.min.css">
<script src="/javascripts/highlight.min.js"></script>
<link rel="stylesheet" title="Solarized Dark" href="/stylesheets/solarized-dark.css">

View File

@ -1,30 +1,34 @@
<div class="card card-inverse bg-default">
<div class="card-block bg-default">
<div class="rotate">
<i class="fa fa-database fa-5x"></i>
</div>
<div class="form-group row">
<form action="/iskanje" method="GET" class="iskalnik col-sm-12 col-lg-7">
<label for="iskalnik">Išči poslovne subjekte:</label>
<div class="input-group input-group-lg">
<input type="text" id="iskalnik" class="form-control" aria-label="Text input with dropdown button" name="poizvedba" placeholder="Naziv subjekta...">
<div class="input-group-btn">
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Išči
</button>
<div class="dropdown-menu dropdown-menu-right">
<button class="dropdown-item" name="gumbPrs" value="1">Išči po poslovnem registru</button>
<button class="dropdown-item" name="gumbRpu" value="1">Išči po registru proračunskih uporabnikov</button>
</div>
</div>
<div class="clearfix"></div>
<div class="row mb-3">
<div class="col-sm-12">
<div class="card card-inverse bg-default">
<div class="card-body bg-default">
<div class="rotate">
<i class="fa fa-database fa-5x"></i>
</div>
<div class="form-control-feedback">Z iskalnikom lahko iščete po registru proračunskih uporabnikov ali po poslovnem registru.</div>
<small class="form-text text-muted">
V poslovnem registru so vsi poslovni subjekti tako zasebnega kot javnega prava, ki nastopajo kot prejemniki transakcij.
V registru proračunskih uporabnikov so državni organi in podjetja v državni lasti in nastopajo kot plačniki transakcij.
</small>
</form>
<div class="form-group row">
<form action="/iskanje" method="GET" class="iskalnik col-sm-12 col-lg-7">
<label for="iskalnik">Išči poslovne subjekte:</label>
<div class="input-group input-group-lg">
<input type="text" id="iskalnik" class="form-control" aria-label="Text input with dropdown button" name="poizvedba" placeholder="Naziv subjekta...">
<div class="input-group-btn">
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Išči
</button>
<div class="dropdown-menu dropdown-menu-right">
<button class="dropdown-item" name="gumbPrs" value="1">Išči po poslovnem registru</button>
<button class="dropdown-item" name="gumbRpu" value="1">Išči po registru proračunskih uporabnikov</button>
</div>
</div>
<div class="clearfix"></div>
</div>
<div class="form-control-feedback">Z iskalnikom lahko iščete po registru proračunskih uporabnikov ali po poslovnem registru.</div>
<small class="form-text text-muted">
V poslovnem registru so vsi poslovni subjekti tako zasebnega kot javnega prava, ki nastopajo kot prejemniki transakcij.
V registru proračunskih uporabnikov so državni organi in podjetja v državni lasti in nastopajo kot plačniki transakcij.
</small>
</form>
</div>
</div>
</div>
</div>
</div>

View File

@ -11,85 +11,89 @@
<div class="page-header">
<h1><%= subjektZS[0].popolnoime.toString().replace('\&amp;','\&') %><button type="button" id="priljubljeneGumb" class="btn btn-success btn-sm"><i class="fa fa-heart"></i> Dodaj med priljubljene</button></h1>
</div>
<%- include partial/iskalnik.ejs %>
<div class="card">
<div class="card-img-top" id="basicMap" style="height:400px"></div><!-- card-img-top -->
<div class="card-block">
<small id="odruzbi">
<img src="/images/loading.gif" />
</small>
</div><!-- card-block -->
<% if(lokacijaZS.length > 0) { %>
<script>
var iconFeatures=[];
var iconFeature = new ol.Feature({
geometry: new ol.geom.Point(ol.proj.transform([<%= lokacijaZS[0].longitude %>, <%= lokacijaZS[0].latitude %>], 'EPSG:4326',
'EPSG:3857')),
name: 'Null Island',
population: 4000,
rainfall: 500
});
iconFeatures.push(iconFeature);
var vectorSource = new ol.source.Vector({
features: iconFeatures //add an array of features
});
var iconStyle = new ol.style.Style({
image: new ol.style.Icon(/** @type {olx.style.IconOptions} */ ({
anchor: [0.5, 46],
anchorXUnits: 'fraction',
anchorYUnits: 'pixels',
opacity: 0.75,
src: '/images/icon.png'
}))
});
var vectorLayer = new ol.layer.Vector({
source: vectorSource,
style: iconStyle
});
var map = new ol.Map({
target: 'basicMap',
layers: [
new ol.layer.Tile({
source: new ol.source.OSM()
}),
],
view: new ol.View({
center: new ol.geom.Point([<%= lokacijaZS[0].longitude %>, <%= lokacijaZS[0].latitude %>])
.transform('EPSG:4326', 'EPSG:3857').getCoordinates(),
zoom: 16
})
})
map.addLayer(vectorLayer)
</script>
<% } else { %>
<script type="text/javascript">
var address = '<%= subjektZS[0].ulica %> <%= subjektZS[0].hs %><%= subjektZS[0].dodatek || '' %>, <%= subjektZS[0].po %> <%= subjektZS[0].posta %>';
var map = new google.maps.Map(document.getElementById('basicMap'), {
mapTypeId: google.maps.MapTypeId.TERRAIN,
zoom: 16
});
var geocoder = new google.maps.Geocoder();
geocoder.geocode({
'address': address
},
function(results, status) {
if(status == google.maps.GeocoderStatus.OK) {
new google.maps.Marker({
position: results[0].geometry.location,
map: map
<%- include partial/iskalnik.ejs %>
<div class="row mb-3">
<div class="col-sm-12">
<div class="card">
<div class="card-img-top" id="basicMap" style="height:400px"></div><!-- card-img-top -->
<div class="card-body">
<small id="odruzbi">
<img src="/images/loading.gif" />
</small>
</div><!-- card-body -->
<% if(lokacijaZS.length > 0) { %>
<script>
var iconFeatures=[];
var iconFeature = new ol.Feature({
geometry: new ol.geom.Point(ol.proj.transform([<%= lokacijaZS[0].longitude %>, <%= lokacijaZS[0].latitude %>], 'EPSG:4326',
'EPSG:3857')),
name: 'Null Island',
population: 4000,
rainfall: 500
});
map.setCenter(results[0].geometry.location);
var xhttp = new XMLHttpRequest();
xhttp.open("POST", "/ajax", true);
xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
xhttp.send("davcna="+<%= subjektZS[0].davcna %>+"&location="+results[0].geometry.location);
}
});
</script>
<% } %>
</div><!-- card -->
iconFeatures.push(iconFeature);
var vectorSource = new ol.source.Vector({
features: iconFeatures //add an array of features
});
var iconStyle = new ol.style.Style({
image: new ol.style.Icon(/** @type {olx.style.IconOptions} */ ({
anchor: [0.5, 46],
anchorXUnits: 'fraction',
anchorYUnits: 'pixels',
opacity: 0.75,
src: '/images/icon.png'
}))
});
var vectorLayer = new ol.layer.Vector({
source: vectorSource,
style: iconStyle
});
var map = new ol.Map({
target: 'basicMap',
layers: [
new ol.layer.Tile({
source: new ol.source.OSM()
}),
],
view: new ol.View({
center: new ol.geom.Point([<%= lokacijaZS[0].longitude %>, <%= lokacijaZS[0].latitude %>])
.transform('EPSG:4326', 'EPSG:3857').getCoordinates(),
zoom: 16
})
})
map.addLayer(vectorLayer)
</script>
<% } else { %>
<script type="text/javascript">
var address = '<%= subjektZS[0].ulica %> <%= subjektZS[0].hs %><%= subjektZS[0].dodatek || '' %>, <%= subjektZS[0].po %> <%= subjektZS[0].posta %>';
var map = new google.maps.Map(document.getElementById('basicMap'), {
mapTypeId: google.maps.MapTypeId.TERRAIN,
zoom: 16
});
var geocoder = new google.maps.Geocoder();
geocoder.geocode({
'address': address
},
function(results, status) {
if(status == google.maps.GeocoderStatus.OK) {
new google.maps.Marker({
position: results[0].geometry.location,
map: map
});
map.setCenter(results[0].geometry.location);
var xhttp = new XMLHttpRequest();
xhttp.open("POST", "/ajax", true);
xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
xhttp.send("davcna="+<%= subjektZS[0].davcna %>+"&location="+results[0].geometry.location);
}
});
</script>
<% } %>
</div><!-- card -->
</div><!-- col-sm-12 -->
</div><!-- row -->
<h2>Transakcije</h2>
<div id="transakcije-graf"><canvas id="canvas" height="150" width="600" ></canvas></div>
<table class="table table-striped" id="transakcije">
@ -118,56 +122,56 @@
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="durs">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/dolzniki.ejs%>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="dutb">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/dutb.ejs %>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="evidence">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/evidence.ejs %>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="omejitve">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/omejitve-podj.ejs %>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="podruznice">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/podruznice.ejs %>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="uppd">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/uppd.ejs %>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="tecajnica">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/tecajnica.ejs %>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="narocila">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/narocila-podj.ejs %>
</div>
</div>
@ -260,7 +264,7 @@
podjetjaArray.sort()
localStorage.setItem("podjetja", podjetjaArray)
$('#opozorilo').html(
'<div class="alert alert-success alert-dismissible fade in" role="alert">'+
'<div class="alert alert-success alert-dismissible fade show" role="alert">'+
' <button type="button" class="close" data-dismiss="alert" aria-label="Close">'+
' <span aria-hidden="true">&times;</span>'+
' </button>'+
@ -269,7 +273,7 @@
);
} else {
$('#opozorilo').html(
'<div class="alert alert-info alert-dismissible fade in" role="alert">'+
'<div class="alert alert-info alert-dismissible fade show" role="alert">'+
' <button type="button" class="close" data-dismiss="alert" aria-label="Close">'+
' <span aria-hidden="true">&times;</span>'+
' </button>'+

View File

@ -23,9 +23,9 @@
<th>Šifra proračunskega uporabnika</th>
<th></th>
</tr>
<tbody>
</tbody>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
@ -42,9 +42,9 @@
<th>Davčna številka</th>
<th></th>
</tr>
<tbody>
</tbody>
</thead>
<tbody>
</tbody>
</table>
</div>
</div>
@ -54,7 +54,7 @@
</button>
</p>
<div class="collapse" id="collapseExample">
<div class="card card-block">
<div class="card card-body">
<p>Aplikacija uporablja lokalno shrambo (localStorage) za shranjevanje podatkov o priljubljenih državnih organih in podjetjih. Če želite podatke odstraniti,
jih lahko pobrišete z uporabo spodnjega gumba - s tem bodo izbrisani vsi podatki, ki jih na vaš računalnik shranjuje aplikacija. Brisanja ni mogoče razveljaviti.</p>
@ -406,7 +406,7 @@
$('#pobrisi-shrambo').click(function () {
localStorage.clear();
$('#opozorilo').html(
'<div class="alert alert-success alert-dismissible fade in" role="alert">'+
'<div class="alert alert-success alert-dismissible fade show" role="alert">'+
' <button type="button" class="close" data-dismiss="alert" aria-label="Close">'+
' <span aria-hidden="true">&times;</span>'+
' </button>'+

View File

@ -15,7 +15,7 @@
<div class="card-deck">
<div class="card">
<div class="card-img-top" id="basicMap2" style="height:400px;"></div>
<div class="card-block">
<div class="card-body">
<h5><%= subjekt[0].naziv %></h5>
<small>
<label>Naslov:</label> <%= subjekt[0].naslov %>, <%= subjekt[0].postna_stevilka %> <%= subjekt[0].posta %> |
@ -28,7 +28,7 @@
</div>
<div class="card">
<div class="card-img-top" id="basicMap1" style="height:400px;"></div>
<div class="card-block">
<div class="card-body">
<h5><%= subjektZS[0].popolnoime.replace('\&amp;','\&') %></h5>
<small>
<label>Oblika:</label> <%= subjektZS[0].oblika %> |
@ -218,35 +218,35 @@
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="dolzniki">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/dolzniki.ejs%>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="omejitve">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/omejitve-razmerje.ejs %>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="dutb">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/dutb.ejs %>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="krsitveomejitev">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/krsitveomejitev.ejs %>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="narocila">
<div class="card">
<div class="card-block">
<div class="card-body">
<%- include partial/narocila-razmerje.ejs %>
</div>
</div>

View File

@ -11,19 +11,20 @@
</div>
<%- include partial/iskalnik.ejs %>
<h2>Statistike aktivnih podjetij v poslovnem registru Slovenije</h2>
<div class="col-lg-4"><canvas id="chart-area" width="300" height="300" /></div>
<div class="col-lg-8">
<table class="table" id="prsporegijah">
<thead>
<tr>
<th>Regija</th>
<th>Število družb</th>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
<!--/row-->
<div class="row">
<div class="col-lg-4"><canvas id="chart-area" width="300" height="300" /></div>
<div class="col-lg-8">
<table class="table" id="prsporegijah">
<thead>
<tr>
<th>Regija</th>
<th>Število družb</th>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
</div><!--/row-->
</div>
</div>
</div>

View File

@ -61,7 +61,7 @@
}, function(data, status) {
if(data == "OK" && status == "success") {
$('#opozorilo').html(
'<div class="alert alert-success alert-dismissible fade in" role="alert">'+
'<div class="alert alert-success alert-dismissible fade show" role="alert">'+
' <button type="button" class="close" data-dismiss="alert" aria-label="Close">'+
' <span aria-hidden="true">&times;</span>'+
' </button>'+
@ -70,7 +70,7 @@
)
} else {
$('#opozorilo').html(
'<div class="alert alert-danger alert-dismissible fade in" role="alert">'+
'<div class="alert alert-danger alert-dismissible fade show" role="alert">'+
' <button type="button" class="close" data-dismiss="alert" aria-label="Close">'+
' <span aria-hidden="true">&times;</span>'+
' </button>'+