roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-05-11 06:17:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

minor fixes and iframe css

Browse source
This commit is contained in:
Rainer Gümpelein 2022-04-02 20:28:45 +02:00
parent 381943be42
commit fd29218991
9 changed files with 155 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

11
copri4/main/css/local_style_2.css
View file

@ -910,23 +910,24 @@ div#Container_txt1 {
ul#BigNavi {
font-size: 14px;
margin: 0;
padding-top:70px;
padding-top:65px;
vertical-align:top;
text-align:center;
height:100px;
height:80px;
border:0px solid white;
}
ul#BigNavi li {
list-style: none;
display: inline;
height:100px;
display: inline-block;
text-align:center;
margin: 0 auto;
margin: 10px auto;
}
ul#BigNavi a {
text-align:center;
margin: 1em;
padding: 3em;
border: 0px solid white;
border: 0px solid black;
text-decoration: none;
font-weight: normal;
background-color:white;

8
copri4/main/src/Mod/APIsigoclient.pm
View file

@ -87,7 +87,7 @@ sub sigo_available {
if(ref($response_in) eq "HASH"){
foreach my $resp (@{ $response_in->{items} }) {
print FILE Dumper($resp) . "\n";
print FILE "response_in loop\n" . Dumper($resp) . "\n";
if($dbt->{operator}->{$varenv->{dbname}}->{operatorApp} && $q->param('request') eq "stations_available"){
@ -124,7 +124,7 @@ sub sigo_available {
print FILE "Bike: $bike\n";
$return->{$bike}->{bike} = "$bike";
$return->{$bike}->{authed} = "$authed";
$return->{$bike}->{station} = "$resp->{site}->{id}" || "";
$return->{$bike}->{station} = "SX$resp->{site}->{id}" || "";
$return->{$bike}->{uri_operator} = "$dbt->{operator}->{$varenv->{dbname}}->{operatorApp}";
$return->{$bike}->{description} = "E-Lastenrad";
$return->{$bike}->{gps}->{latitude} = "$resp->{state}->{lat}" || "";
@ -142,7 +142,8 @@ sub sigo_available {
}
#$return->{$bike}->{lock_state} = "undefined";#?
$return->{$bike}->{lock_state} = "unlocked";
#$return->{$bike}->{lock_state} = "unlocked";# I think default should be unlocked
$return->{$bike}->{lock_state} = "locked";
if($resp->{state}->{locked}){
$return->{$bike}->{lock_state} = "locked";
}
@ -173,6 +174,7 @@ sub sigo_available {
warn $@;
}
print FILE "response_in return\n" . Dumper($return) . "\n";
close(FILE);
return $return;

13
copri4/main/src/Mod/DBtank.pm
View file

@ -288,16 +288,17 @@ sub channel_map(){
184 => "web App",#mig
185 => "konstanz App",#mig
186 => "sharee App",#mig
187 => "shareetool App",#mig
187 => "shareetool",#mig
188 => "sys API",
192 => "Web Bayern",
193 => "Web Demo",#mig
194 => "Web Example",#mig
195 => "Web KN",#mig and import
192 => "web Bayern",
193 => "web demo",#mig
194 => "web example",#mig
195 => "web konrad",#mig and import
196 => "DMS Form std",#mig
197 => "Web Form std",#mig
197 => "web sharee.bike",#mig
198 => "primary",#mig
199 => "LV API",#mig
201 => "web Rentamania",#mig
};
return $channel;
}

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

@ -734,12 +734,11 @@ sub handler {
}
my $base_uri = "true";
my $title = "$varenv{syshost} ";
$title .= $dbt->{primary}->{$varenv{dbname}}->{pprefix} if($dbt->{primary}->{$varenv{dbname}}->{pprefix});
$title .= $dbt->{operator}->{$varenv{dbname}}->{project} if($dbt->{operator}->{$varenv{dbname}}->{project});
$title .= " " . $dbt->{operator}->{$varenv{dbname}}->{oprefix} if($dbt->{operator}->{$varenv{dbname}}->{oprefix});
$title .= $dbt->{website}->{$varenv{syshost}}->{project} if($dbt->{website}->{$varenv{syshost}}->{project});
$title .= " DEVEL $varenv{dbname}" if($dbt->{copri_conf}->{stage} eq "test");
my $title = "";
$title .= "devel $varenv{syshost} " if($dbt->{copri_conf}->{stage} eq "test");
#$title .= $dbt->{primary}->{$varenv{dbname}}->{title} if($dbt->{primary}->{$varenv{dbname}}->{title});
$title .= " " . $dbt->{operator}->{$varenv{dbname}}->{title} if($dbt->{operator}->{$varenv{dbname}}->{title});
$title .= " " . $dbt->{website}->{$varenv{syshost}}->{title} if($dbt->{website}->{$varenv{syshost}}->{title});
my $html5 = $q->start_html(-title=>"$title",
-lang=>'de',
-onload=>"$onload",

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

@ -166,7 +166,8 @@ sub kmlGenerator {
$station_groupID = $1 if($station_group =~ /(\d+)/);
$bike_groupID = $1 if($bike_group =~ /(\d+)/);
$bw->log("KMLout bike available if: $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}","","");
#if Lastenrad
if($station_groupID == $lastenrad && $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}){
$place_pin{$station} = $icon_green;

5
copri4/main/src/Mod/Payment.pm
View file

@ -319,9 +319,6 @@ sub preauthorizationCC_main {
telephonenumber => "$ctadr->{txt07}",
amount => "$amount",
currency => 'EUR',
#Parameter ( personal data )
lastname => "$ctadr->{txt01}",
country => "$ctadr->{txt10}",
pseudocardpan => "$ctadr->{ct_name}",
ecommercemode => "internet", # wird zu 3Dscheck,
reference => "$reference"
@ -624,7 +621,7 @@ sub pdfmandat {
print EMA "$topdf --page-size A4 '$varenv->{wwwhost}/PDFGenerator?printer_id=SEPA-Lastschriftmandat\&mandant_main_id=$dbt->{shareedms_conf}->{parent_id}\&id=$ctadr->{c_id}' $varenv->{basedir}/pdfinvoice/SEPA-Lastschriftmandat-$varenv->{dbname}-$ctadr->{ct_name}.pdf\nreturn: $print_return\nfilesize: $filesize\nexit_code: $exit_code\n";
}
close EMA;
return "$varenv->{logdir}/pdfinvoice/SEPA-Lastschriftmandat-$varenv->{dbname}-$ctadr->{ct_name}.pdf";
return "$varenv->{basedir}/pdfinvoice/SEPA-Lastschriftmandat-$varenv->{dbname}-$ctadr->{ct_name}.pdf";
}
#end ported from payone_post.pl
#