roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-05-10 22:16:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

example configuration

Browse source
This commit is contained in:
Rainer Gümpelein 2022-01-27 20:30:35 +01:00
parent dc2b4f7086
commit 64991348da
23 changed files with 563 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
copri4/main/img/LastenradBay_Standortpfeil_blau_03a.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

57
copri4/main/img/LastenradBay_Standortpfeil_blau_03a.svg Executable file
View file

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="100px"
height="100px" viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
<style type="text/css">
.st0{display:none;}
.st1{display:inline;fill:#0000FF;}
.st2{display:inline;fill:#FF0000;}
.st3{fill:#009BDA;}
.st4{display:inline;fill:#3F4A75;}
.st5{display:inline;fill:#00813E;}
.st6{display:inline;fill:#FFFFFF;}
.st7{clip-path:url(#SVGID_2_);fill:#FFFFFF;}
</style>
<g id="Ebene_7" class="st0">
<rect x="-21" y="-8" class="st1" width="142" height="113"/>
</g>
<g id="Ebene_1" class="st0">
<path class="st2" d="M80.1,69.9c7-7.4,11.3-17.4,11.3-28.4C91.4,18.6,72.9,0,50,0S8.6,18.6,8.6,41.4c0,11,4.3,21,11.3,28.4l0,0
l0.3,0.3c0.4,0.4,0.8,0.8,1.2,1.2L50,100l28.7-28.7c0.4-0.4,0.8-0.8,1.2-1.2L80.1,69.9L80.1,69.9z"/>
</g>
<g id="Ebene_1_Kopie">
<path class="st3" d="M80.1,69.9c7-7.4,11.3-17.4,11.3-28.4C91.4,18.6,72.9,0,50,0S8.6,18.6,8.6,41.4c0,11,4.3,21,11.3,28.4l0,0
l0.3,0.3c0.4,0.4,0.8,0.8,1.2,1.2L50,100l28.7-28.7c0.4-0.4,0.8-0.8,1.2-1.2L80.1,69.9L80.1,69.9z"/>
</g>
<g id="Ebene_1_Kopie_Kopie_3" class="st0">
<path class="st4" d="M80.1,69.9c7-7.4,11.3-17.4,11.3-28.4C91.4,18.6,72.9,0,50,0S8.6,18.6,8.6,41.4c0,11,4.3,21,11.3,28.4l0,0
l0.3,0.3c0.4,0.4,0.8,0.8,1.2,1.2L50,100l28.7-28.7c0.4-0.4,0.8-0.8,1.2-1.2L80.1,69.9L80.1,69.9z"/>
</g>
<g id="Ebene_1_Kopie_Kopie_2" class="st0">
<path class="st5" d="M80.1,69.9c7-7.4,11.3-17.4,11.3-28.4C91.4,18.6,72.9,0,50,0S8.6,18.6,8.6,41.4c0,11,4.3,21,11.3,28.4l0,0
l0.3,0.3c0.4,0.4,0.8,0.8,1.2,1.2L50,100l28.7-28.7c0.4-0.4,0.8-0.8,1.2-1.2L80.1,69.9L80.1,69.9z"/>
</g>
<g id="Ebene_1_Kopie_Kopie" class="st0">
<path class="st6" d="M80.1,69.9c7-7.4,11.3-17.4,11.3-28.4C91.4,18.6,72.9,0,50,0S8.6,18.6,8.6,41.4c0,11,4.3,21,11.3,28.4l0,0
l0.3,0.3c0.4,0.4,0.8,0.8,1.2,1.2L50,100l28.7-28.7c0.4-0.4,0.8-0.8,1.2-1.2L80.1,69.9L80.1,69.9z"/>
</g>
<g id="Ebene_2_Kopie_Kopie_Kopie_Kopie_Kopie">
<g>
<defs>
<circle id="SVGID_1_" cx="50" cy="41.4" r="38.4"/>
</defs>
<clipPath id="SVGID_2_">
<use xlink:href="#SVGID_1_" style="overflow:visible;"/>
</clipPath>
<path class="st7" d="M88.4,29.2c-3.7-1-15.8-3.9-35.7-4l6.9,22.4h0c3.1-6.9,11.2-10,18.1-6.9c3.1,1.4,5.5,3.8,6.9,6.9h3.8V29.2z
M88.4,50.4h-5.6c-1.6-6-7.7-9.5-13.6-8c-3.9,1-6.9,4.1-8,8h-3.8c-2.7-8.7-7.4-24.1-10.1-32.8c-0.7-2.3-2.9-3.9-5.3-3.9h-2v2.8h2
c1.2,0,2.3,0.8,2.7,2c0,0,9.8,32,9.8,32H38.3c0,0-7.4-19.8-9.4-25.2l5.9-1.4c0.4-0.1,0.6-0.5,0.5-0.8c-0.1-0.3-0.4-0.5-0.7-0.5
l-11.9,0v2.8h3.1l1,2.8l-4.1,9.1c-3.8-1.2-7.9-0.8-11.3,1.2v3.4c2.9-2.3,6.7-3,10.2-2l-5.2,11.6c-0.3,0.7,0,1.5,0.7,1.9
c0.2,0.1,0.4,0.1,0.6,0.1h11.5c-1.5,6-7.6,9.6-13.6,8c-1.5-0.4-2.9-1.1-4.2-2.1v3.4c6.7,3.9,15.2,1.6,19.1-5.1
c0.8-1.3,1.3-2.7,1.6-4.2h28.7c0,0,0,0,0,0c0,6.2,5,11.2,11.2,11.2c6.2,0,11.2-5,11.2-11.2c0,0,0,0,0,0h5.2V50.4z M20,50.4
l4.3-9.6c3.4,2,5.4,5.7,5.4,9.6H20z M32.5,50.4c0-5-2.7-9.7-7.1-12.2l2.9-6.5l7,18.7H32.5z M72.1,44.9c3.5,0,6.7,2.2,7.9,5.5H64.2
C65.4,47.1,68.6,44.9,72.1,44.9L72.1,44.9z M72.1,61.6c-4.6,0-8.4-3.7-8.4-8.4l0,0c0,0,0,0,0,0h16.7c0,0,0,0,0,0
C80.5,57.8,76.7,61.6,72.1,61.6L72.1,61.6z"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
copri4/main/img/LastenradBay_Standortpfeil_gruen_03a.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

32
copri4/main/img/LastenradBay_Standortpfeil_gruen_03a.svg Executable file
View file

@ -0,0 +1,32 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="82.87" height="100" viewBox="0 0 82.87 100">
<defs>
<style>
.cls-1 {
fill: none;
}
.cls-2 {
fill: #00813e;
}
.cls-3 {
clip-path: url(#clip-path);
}
.cls-4 {
fill: #fff;
}
</style>
<clipPath id="clip-path" transform="translate(-8.57 0)">
<circle class="cls-1" cx="50" cy="41.43" r="38.43"/>
</clipPath>
</defs>
<g id="Ebene_1_Kopie_Kopie_2" data-name="Ebene 1 Kopie Kopie 2">
<path class="cls-2" d="M80.12,69.86a41.43,41.43,0,1,0-60.24,0h0l.27.27c.38.39.76.78,1.15,1.15L50,100,78.71,71.29c.39-.37.77-.76,1.15-1.15l.27-.27Z" transform="translate(-8.57 0)"/>
</g>
<g id="Ebene_2_Kopie_Kopie_Kopie_Kopie_Kopie" data-name="Ebene 2 Kopie Kopie Kopie Kopie Kopie">
<g class="cls-3">
<path class="cls-4" d="M88.43,29.19c-3.72-1-15.77-3.86-35.74-4l6.89,22.39h0a13.72,13.72,0,0,1,25,0h3.82Zm0,21.18H82.88a11.15,11.15,0,0,0-21.56,0H57.5c-2.7-8.72-7.4-24.13-10.09-32.84a5.59,5.59,0,0,0-5.35-3.94h-2v2.79h2a2.83,2.83,0,0,1,2.68,2s9.83,32,9.82,32H38.27s-7.36-19.79-9.39-25.2l5.92-1.43a.68.68,0,0,0,.52-.83.7.7,0,0,0-.68-.54H22.74v2.8h3.15l1,2.8-4.06,9.09a13.94,13.94,0,0,0-11.3,1.18v3.38a11.16,11.16,0,0,1,10.16-2L16.55,51.2a1.4,1.4,0,0,0,.71,1.85,1.29,1.29,0,0,0,.58.12H29.38a11.18,11.18,0,0,1-17.81,6V62.5a14,14,0,0,0,19.09-5.13,13.7,13.7,0,0,0,1.59-4.2H60.94v0a11.16,11.16,0,0,0,22.32,0v0h5.17ZM20,50.37l4.29-9.61a11.21,11.21,0,0,1,5.45,9.61Zm12.54,0a14,14,0,0,0-7.1-12.18l2.9-6.48,7,18.66ZM72.1,44.85A8.38,8.38,0,0,1,80,50.37H64.25a8.36,8.36,0,0,1,7.85-5.52Zm0,16.73a8.36,8.36,0,0,1-8.36-8.36h0v0H80.46v0a8.37,8.37,0,0,1-8.36,8.35Z" transform="translate(-8.57 0)"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
copri4/main/img/LastenradBay_Standortpfeil_klenze-blau_03a.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

57
copri4/main/img/LastenradBay_Standortpfeil_klenze-blau_03a.svg Executable file
View file

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="100px"
height="100px" viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
<style type="text/css">
.st0{display:none;}
.st1{display:inline;fill:#0000FF;}
.st2{display:inline;fill:#FF0000;}
.st3{display:inline;fill:#009BDA;}
.st4{fill:#3F4A75;}
.st5{display:inline;fill:#00813E;}
.st6{display:inline;fill:#FFFFFF;}
.st7{clip-path:url(#SVGID_2_);fill:#FFFFFF;}
</style>
<g id="Ebene_7" class="st0">
<rect x="-21" y="-8" class="st1" width="142" height="113"/>
</g>
<g id="Ebene_1" class="st0">
<path class="st2" d="M80.1,69.9c7-7.4,11.3-17.4,11.3-28.4C91.4,18.6,72.9,0,50,0S8.6,18.6,8.6,41.4c0,11,4.3,21,11.3,28.4l0,0
l0.3,0.3c0.4,0.4,0.8,0.8,1.2,1.2L50,100l28.7-28.7c0.4-0.4,0.8-0.8,1.2-1.2L80.1,69.9L80.1,69.9z"/>
</g>
<g id="Ebene_1_Kopie" class="st0">
<path class="st3" d="M80.1,69.9c7-7.4,11.3-17.4,11.3-28.4C91.4,18.6,72.9,0,50,0S8.6,18.6,8.6,41.4c0,11,4.3,21,11.3,28.4l0,0
l0.3,0.3c0.4,0.4,0.8,0.8,1.2,1.2L50,100l28.7-28.7c0.4-0.4,0.8-0.8,1.2-1.2L80.1,69.9L80.1,69.9z"/>
</g>
<g id="Ebene_1_Kopie_Kopie_3">
<path class="st4" d="M80.1,69.9c7-7.4,11.3-17.4,11.3-28.4C91.4,18.6,72.9,0,50,0S8.6,18.6,8.6,41.4c0,11,4.3,21,11.3,28.4l0,0
l0.3,0.3c0.4,0.4,0.8,0.8,1.2,1.2L50,100l28.7-28.7c0.4-0.4,0.8-0.8,1.2-1.2L80.1,69.9L80.1,69.9z"/>
</g>
<g id="Ebene_1_Kopie_Kopie_2" class="st0">
<path class="st5" d="M80.1,69.9c7-7.4,11.3-17.4,11.3-28.4C91.4,18.6,72.9,0,50,0S8.6,18.6,8.6,41.4c0,11,4.3,21,11.3,28.4l0,0
l0.3,0.3c0.4,0.4,0.8,0.8,1.2,1.2L50,100l28.7-28.7c0.4-0.4,0.8-0.8,1.2-1.2L80.1,69.9L80.1,69.9z"/>
</g>
<g id="Ebene_1_Kopie_Kopie" class="st0">
<path class="st6" d="M80.1,69.9c7-7.4,11.3-17.4,11.3-28.4C91.4,18.6,72.9,0,50,0S8.6,18.6,8.6,41.4c0,11,4.3,21,11.3,28.4l0,0
l0.3,0.3c0.4,0.4,0.8,0.8,1.2,1.2L50,100l28.7-28.7c0.4-0.4,0.8-0.8,1.2-1.2L80.1,69.9L80.1,69.9z"/>
</g>
<g id="Ebene_2_Kopie_Kopie_Kopie_Kopie_Kopie">
<g>
<defs>
<circle id="SVGID_1_" cx="50" cy="41.4" r="38.4"/>
</defs>
<clipPath id="SVGID_2_">
<use xlink:href="#SVGID_1_" style="overflow:visible;"/>
</clipPath>
<path class="st7" d="M88.4,29.2c-3.7-1-15.8-3.9-35.7-4l6.9,22.4h0c3.1-6.9,11.2-10,18.1-6.9c3.1,1.4,5.5,3.8,6.9,6.9h3.8V29.2z
M88.4,50.4h-5.6c-1.6-6-7.7-9.5-13.6-8c-3.9,1-6.9,4.1-8,8h-3.8c-2.7-8.7-7.4-24.1-10.1-32.8c-0.7-2.3-2.9-3.9-5.3-3.9h-2v2.8h2
c1.2,0,2.3,0.8,2.7,2c0,0,9.8,32,9.8,32H38.3c0,0-7.4-19.8-9.4-25.2l5.9-1.4c0.4-0.1,0.6-0.5,0.5-0.8c-0.1-0.3-0.4-0.5-0.7-0.5
l-11.9,0v2.8h3.1l1,2.8l-4.1,9.1c-3.8-1.2-7.9-0.8-11.3,1.2v3.4c2.9-2.3,6.7-3,10.2-2l-5.2,11.6c-0.3,0.7,0,1.5,0.7,1.9
c0.2,0.1,0.4,0.1,0.6,0.1h11.5c-1.5,6-7.6,9.6-13.6,8c-1.5-0.4-2.9-1.1-4.2-2.1v3.4c6.7,3.9,15.2,1.6,19.1-5.1
c0.8-1.3,1.3-2.7,1.6-4.2h28.7c0,0,0,0,0,0c0,6.2,5,11.2,11.2,11.2c6.2,0,11.2-5,11.2-11.2c0,0,0,0,0,0h5.2V50.4z M20,50.4
l4.3-9.6c3.4,2,5.4,5.7,5.4,9.6H20z M32.5,50.4c0-5-2.7-9.7-7.1-12.2l2.9-6.5l7,18.7H32.5z M72.1,44.9c3.5,0,6.7,2.2,7.9,5.5H64.2
C65.4,47.1,68.6,44.9,72.1,44.9L72.1,44.9z M72.1,61.6c-4.6,0-8.4-3.7-8.4-8.4l0,0c0,0,0,0,0,0h16.7c0,0,0,0,0,0
C80.5,57.8,76.7,61.6,72.1,61.6L72.1,61.6z"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
copri4/main/img/LastenradBay_Standortpfeil_rot_03a.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

32
copri4/main/img/LastenradBay_Standortpfeil_rot_03a.svg Executable file
View file

@ -0,0 +1,32 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="82.87" height="100" viewBox="0 0 82.87 100">
<defs>
<style>
.cls-1 {
fill: none;
}
.cls-2 {
fill: red;
}
.cls-3 {
clip-path: url(#clip-path);
}
.cls-4 {
fill: #fff;
}
</style>
<clipPath id="clip-path" transform="translate(-8.57)">
<circle class="cls-1" cx="50" cy="41.43" r="38.43"/>
</clipPath>
</defs>
<g id="Ebene_1" data-name="Ebene 1">
<path class="cls-2" d="M80.12,69.86a41.43,41.43,0,1,0-60.24,0h0l.27.27c.38.39.76.78,1.15,1.15L50,100,78.71,71.29c.39-.37.77-.76,1.15-1.15l.27-.27Z" transform="translate(-8.57)"/>
</g>
<g id="Ebene_2_Kopie_Kopie_Kopie_Kopie_Kopie" data-name="Ebene 2 Kopie Kopie Kopie Kopie Kopie">
<g class="cls-3">
<path class="cls-4" d="M88.43,29.19c-3.72-1-15.77-3.86-35.74-4l6.89,22.39h0a13.72,13.72,0,0,1,25,0h3.82Zm0,21.18H82.88a11.15,11.15,0,0,0-21.56,0H57.5c-2.7-8.72-7.4-24.13-10.09-32.84a5.59,5.59,0,0,0-5.35-3.94h-2v2.79h2a2.83,2.83,0,0,1,2.68,2s9.83,32,9.82,32H38.27s-7.36-19.79-9.39-25.2l5.92-1.43a.68.68,0,0,0,.52-.83.7.7,0,0,0-.68-.54H22.74v2.8h3.15l1,2.8-4.06,9.09a13.94,13.94,0,0,0-11.3,1.18v3.38a11.16,11.16,0,0,1,10.16-2L16.55,51.2a1.4,1.4,0,0,0,.71,1.85,1.29,1.29,0,0,0,.58.12H29.38a11.18,11.18,0,0,1-17.81,6V62.5a14,14,0,0,0,19.09-5.13,13.7,13.7,0,0,0,1.59-4.2H60.94v0a11.16,11.16,0,0,0,22.32,0v0h5.17ZM20,50.37l4.29-9.61a11.21,11.21,0,0,1,5.45,9.61Zm12.54,0a14,14,0,0,0-7.1-12.18l2.9-6.48,7,18.66ZM72.1,44.85A8.38,8.38,0,0,1,80,50.37H64.25a8.36,8.36,0,0,1,7.85-5.52Zm0,16.73a8.36,8.36,0,0,1-8.36-8.36h0v0H80.46v0a8.37,8.37,0,0,1-8.36,8.35Z" transform="translate(-8.57)"/>
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

6
copri4/main/src/Mod/Indexsharee.pm
View file

@ -310,6 +310,7 @@ sub handler {
#permissions
#DMS Kunden rw
if($R::base_edit && $node_meta->{ct_table} eq "contentadr"){
$bw->log("DMS action from $users_dms->{u_id} on $node_meta->{ct_table}|$R::c_id with: $R::base_edit","","");
if($R::c_id && $R::base_edit eq "remove_chk4rel"){
my $delete_key = "delete_content";
$delete_key = "delete_adr";
@ -325,6 +326,7 @@ sub handler {
#DMS users accounts
if($R::base_edit && $node_meta->{ct_table} eq "users"){#DMS-Account rw
$bw->log("DMS action from $users_dms->{u_id} on $node_meta->{ct_table} with: $R::base_edit","","");
if($R::u_id && $R::base_edit eq "remove_chk4rel"){#users
my $delete_key = "delete_dmsusers";
$return = "failure::Datensatz wirklich löschen. ::?base_edit=$delete_key\&exit_box2=1\&u_id=$R::u_id ::löschen";
@ -339,6 +341,7 @@ sub handler {
#DMS Waren || Einstellung/Service* rw
if($node_meta->{ct_table} eq "content" || $node_meta->{ct_table} eq "contentuser"){
$bw->log("DMS action from $users_dms->{u_id} on $node_meta->{ct_table}|$R::main_id with: $R::rel_edit","","");
if(($node_meta->{ct_table} eq "content" && $users_dms->{int01} == 2) || ($node_meta->{ct_table} eq "contentuser" && $users_dms->{int08} == 2)){
if($R::rel_edit eq "save_relation" && $R::main_id && $R::main_id >= 200000){
$return = $pl->save_relation($R::main_id,$users_dms->{u_id});
@ -346,7 +349,7 @@ sub handler {
$return = $pl->delete_relation($R::main_id,$users_dms->{u_id});
}elsif($R::rel_edit eq "new_relation" && $R::main_id && $R::main_id >= 200000){
$return = $pl->new_relation($R::main_id,$users_dms->{u_id});
}else{
}elsif($R::rel_edit && $R::main_id && $R::main_id >= 200000){
$return = $pm->maininit($users_dms);
}
}elsif($R::rel_edit){
@ -356,6 +359,7 @@ sub handler {
#DMS Faktura
if($node_meta->{ct_table} eq "contenttrans"){
$bw->log("DMS action from $users_dms->{u_id} on $node_meta->{ct_table}|$R::c_id4trans,$R::tpl_id4trans,$R::kind_of_trans with: $R::ct_trans","","");
if($users_dms->{int03} == 1 && $R::ct_trans eq "open"){#DMS Faktura read
$db->update_users4trans($R::c_id4trans,$R::tpl_id4trans,$R::kind_of_trans,$users_dms->{u_id}) if($R::c_id4trans && $R::tpl_id4trans);
}elsif($users_dms->{int03} == 2){#DMS Faktura rw

16
copri4/main/src/Mod/KMLout.pm
View file

@ -78,6 +78,14 @@ sub kmlGenerator {
$project = $dbt->{website}->{$varenv->{syshost}}->{project} if($dbt->{website}->{$varenv->{syshost}}->{project});
$project = $dbt->{operator}->{$varenv->{dbname}}->{project} if($dbt->{operator}->{$varenv->{dbname}}->{project});
#print "$project | $varenv->{syshost} | $users_sharee->{c_id} | $authcookie->{authcookie}";
my $icon_green = "Open_Green.png";
my $icon_red = "Open_Red.png";
my $icon_blue = "Open_Blue.png";
if($project eq "Bayern"){
$icon_green = "LastenradBay_Standortpfeil_gruen_03a.png";
$icon_red = "LastenradBay_Standortpfeil_rot_03a.png";
$icon_blue = "LastenradBay_Standortpfeil_blau_03a.png";
}
my $timestamp = strftime "%Y%m%d%H%M%S", localtime;
my $kmlfile = "sharee-$timestamp-$users_sharee->{c_id}.kml";
@ -122,7 +130,7 @@ sub kmlGenerator {
foreach my $station (keys (%{ $response_stations->{shareejson}->{stations} })) {
$station_hash->{$station} = $response_stations->{shareejson}->{stations}->{$station};
$place_pin{$station} = "Open_Red.png";
$place_pin{$station} = $icon_red;
my $station_desc = "Mietradstation $station";
if($response_stations->{shareejson}->{stations}->{$station}->{description}){
$station_desc = "Mietradstation: $response_stations->{shareejson}->{stations}->{$station}->{description} $station";
@ -156,19 +164,19 @@ sub kmlGenerator {
#if Lastenrad
if($station_groupID == $lastenrad && $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}){
$place_pin{$station} = "Open_Green.png";
$place_pin{$station} = $icon_green;
$place_desc{$station} .= "<p align='left'>&bull; Lastenrad vorrätig: $response_bikes->{shareejson}->{bikes}->{$bike}->{description} $bike</p>";
#print "($station) Lastenrad $bike\n";
}
#if E-Lastenrad
if($station_groupID == $e_lastenrad && $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}){
$place_pin{$station} = "Open_Green.png";
$place_pin{$station} = $icon_green;
$place_desc{$station} .= "<p align='left'>&bull; E-Lastenrad vorrätig: $response_bikes->{shareejson}->{bikes}->{$bike}->{description} $bike</p>";
#print "($station) E-Lastenrad $bike\n";
}
#if Stadtrad
if($station_groupID == $stadtrad && $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}){
$place_pin{$station} = "Open_Green.png";
$place_pin{$station} = $icon_green;
$place_desc{$station} .= "<p align='left'>&bull; Stadtrad vorrätig: $response_bikes->{shareejson}->{bikes}->{$bike}->{description} $bike</p>";
#print "($station) Stadtrad $bike\n";
}

15
copri4/main/src/Mod/NodeEdit.pm
View file

@ -120,6 +120,14 @@ sub admin_tpl(){
#content container
print "<div id='Container_cms'>$superu_id";
print $q->hidden(-name=>'last_node_name', -value=>"$node_meta->{node_name}");
print $q->hidden(-name=>'owner', -value=>"$users_dms->{u_id}");
print $q->hidden(-name=>'parent_id', -value=>"$node_meta->{parent_id}");
print $q->hidden(-name=>'main_id', -value=>"$node_meta->{main_id}");
print $q->hidden(-name=>'template_id', -value=>"$node_meta->{template_id}");
print $q->hidden(-name=>'mode', -value=>"admin");
print $q->start_table({-style=>'margin-top:6px;', -border=>'0', -width=>'100%', -align=>'left', -cellpadding=>'3', -cellspacing=>'3'});
print $q->Tr();
if(1==1){
@ -137,13 +145,6 @@ sub admin_tpl(){
print $q->span({-style=>'margin-left:5em; font-size:0.91em;'}, "$u_name / $change") if($u_name);
print "</td>\n";
print $q->hidden(-name=>'last_node_name', -value=>"$node_meta->{node_name}");
print $q->hidden(-name=>'owner', -value=>"$users_dms->{u_id}");
print $q->hidden(-name=>'parent_id', -value=>"$node_meta->{parent_id}");
print $q->hidden(-name=>'main_id', -value=>"$node_meta->{main_id}");
print $q->hidden(-name=>'mode', -value=>"admin");
print $q->Tr();
print $q->td({-colspan=>'2',-style=>'padding:5px;font-style:italic;'},"Path: $path");
foreach (@tpl_order){

9
copri4/main/src/Mod/Prelib.pm
View file

@ -233,8 +233,8 @@ sub delete_relation {
my $collect_rows=0;
if($R::template_id eq "205"){
(my $collect_node,$collect_rows) = $dbt->collect_noderel($dbh,$noderel->{parent_id},$R::template_id);
if($noderel->{template_id} == 205){
(my $collect_node,$collect_rows) = $dbt->collect_noderel($dbh,$noderel->{parent_id},$noderel->{template_id});
}
my $subrelnode = $dbt->get_subrelnode($dbh,$main_id,"","");
@ -242,6 +242,7 @@ sub delete_relation {
my $deleteable_subnode = 1;
my $deleteable_node = 1;
my $deleteable_last_node = 1;
#TODO, $subrelnode->{template_id} must be unique in Flotte context
if($subrelnode->{template_id} >= 400 && $subrelnode->{template_id} <= 499){
$deleteable_subnode = 1;
if($collect_rows <= 1){
@ -254,7 +255,9 @@ sub delete_relation {
if($ct_record->{c_id} > 0){
$deleteable_node = 0;
}
print FILE "$deleteable_subnode == 0 || $deleteable_node == 0 --> collect_rows: $collect_rows|c_id: $ct_record->{c_id}\n" if($debug);
#print "$deleteable_subnode|$deleteable_node|$deleteable_last_node|$collect_rows";
print FILE "deleteable_subnode:$deleteable_subnode | deleteable_node:$deleteable_node | deleteable_last_node:$deleteable_last_node --> collect_rows: $collect_rows|c_id: $ct_record->{c_id}\n" if($debug);
if($deleteable_last_node == 0){
$ret = "failure::Abbruch, es muss mindestens eine Mietrad Flotte definiert sein. ($collect_rows on $noderel->{parent_id})";