\n";
my $j=0;
- @tpl_order = split /,/,$tpl->{tpl_order};
#2.1 sub-table
print "| \n";
print $q->start_table({-border=>'0', -width=>'100%',-align=>'center', -cellpadding=>'3', -cellspacing=>'0'});
- $j++;
my @_service_valxx = ("","1","2","3","4");
foreach (@tpl_order){
- my ($key,$des,$size,$postdes) = split /=/,$_;
- my $seldes = $des;
- $des .= " ($key)" if($users_dms->{u_id} eq $varenv{superu_id});
+ $j++;
+ if($tpl->{tpl_id} == 199){
+ if($j==1){
+ print $q->Tr();
+ print $q->td({-class=>'content1_cms',-colspan=>3},$q->b("under development, $tpl->{tpl_name}")),"\n";
+ }
+ my ($key,$tplkey,$des,$size,$service_interval,$service_type) = split /=/,$_;
+ $des = " ($key:$tplkey)" if($users_dms->{u_id} eq $varenv{superu_id});
+ if($key =~ /txt\d/ && $tplkey =~ /int\d/){
+ print $q->Tr();
+ print $q->td({-class=>'content1_cms'},"Wartung $des",$q->textfield(-class=>'etxt', -style=>"width:15em;",-name=>"$key", -default=>"")),"\n";
+ print $q->td({-class=>'content1_cms'},"Intervall",$q->textfield(-class=>'etxt', -style=>"width:2em;",-name=>"$key", -default=>""),"Tage"),"\n";
+ print $q->td({-class=>'content1_cms'},$but->radiobox2("$key","$ctrel->{$key}","aus","weich","hart")),"\n";
- $ctrel->{$key} = $q->unescapeHTML("$ctrel->{$key}");
- $ctrel->{$key} = $lb->newline($ctrel->{$key},"",1);
+ }
+ }else{
+ my ($key,$des,$size,$postdes) = split /=/,$_;
+ my $seldes = $des;
+ $des .= " ($key)" if($users_dms->{u_id} eq $varenv{superu_id});
+
+ $ctrel->{$key} = $q->unescapeHTML("$ctrel->{$key}");
+ $ctrel->{$key} = $lb->newline($ctrel->{$key},"",1);
if($key =~ /c_id|ct_name|barcode|txt/ && $size eq "readonly"){
print $q->Tr();
print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
@@ -641,6 +656,7 @@ EOF
$q->textfield(-class=>'etxt',-name=>"e_hh", -override=>'1',-default=>"$e_hh",-size=>"2",-maxlength=>2),":",
$q->textfield(-class=>'etxt',-name=>"e_mi", -override=>'1',-default=>"$e_mi",-size=>"2",-maxlength=>2)),"\n";
}
+ }#end else
}
print $q->end_table;
print " | \n";
diff --git a/copri4/main/src/Tpl/Karte.pm b/copri4/main/src/Tpl/Karte.pm
index 7d9d1b4..85e5af4 100755
--- a/copri4/main/src/Tpl/Karte.pm
+++ b/copri4/main/src/Tpl/Karte.pm
@@ -85,6 +85,7 @@ sub tpl(){
#setting to true to keeps lat,lng and zoom
$preserve_view = "true" if($filesize < 200);
+ print $q->div({-class=>"content2_contact"},"Hier können Lastenfahrräder gemietet werden:"),"\n";
print "\n";
print "
\n";
@@ -95,7 +96,7 @@ print<
div({-style=>"position:absolute;margin-left:$daymarker;border-right: solid thin #86cb00;height:1.7em;"}," "),"\n";# if("$mon" eq "$mon_today");
my $calpath = "Mietjournal";
$calpath = "Alarmjournal" if($ct4rel->{$id}->{int13} == $cttpos->{$ctid}->{int13} && $cttpos->{$ctid}->{int10} == 7);
- print $q->div({-style=>"position:static;margin-left:$day_stpx;width:$rent_day_px;background-color:$scale_color"},$q->a({-class=>"linknav3",-style=>"$time_style",-href=>"$varenv{wwwhost}/$calpath/?cttpos_id=$cttpos->{$ctid}->{c_id}",-title=>"Im $calpath öffnen"},"$hh_en:$mm_en")),"\n";
+ print $q->div({-style=>"position:static;margin-left:$day_stpx;width:$rent_day_px;background-color:$scale_color"},$q->a({-class=>"linknav3",-style=>"$time_style",-href=>"$varenv{wwwhost}/DMS/$calpath/?cttpos_id=$cttpos->{$ctid}->{c_id}",-title=>"Im $calpath öffnen"},"$hh_en:$mm_en")),"\n";
print "\n";
print $q->Tr();
print $q->td({-style=>'padding-top:1px;'},""),"\n";
diff --git a/copri4/main/src/scripts/sig_client.pl b/copri4/main/src/scripts/sig_client.pl
new file mode 100755
index 0000000..9877011
--- /dev/null
+++ b/copri4/main/src/scripts/sig_client.pl
@@ -0,0 +1,113 @@
+#!/usr/bin/perl
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# Copyright (c) Rainer Gümpelein, TeilRad GmbH
+#
+# sudo su www-data -c "./src/scripts/sig_client.pl shareeapp-sx bikes_available"
+#
+# sudo su www-data -c "./src/scripts/sig_client.pl shareeapp-sx reserve 1842 '380116b5-0522-43da-ab66-477744a731a3'"
+# sudo su www-data -c "./src/scripts/sig_client.pl shareeapp-sx rental 1842 '380116b5-0522-43da-ab66-477744a731a3'"
+#
+use vars qw($syshost);
+
+BEGIN {
+ $syshost = $ARGV[0] || die 'syshost not defined';
+}
+
+use lib "/var/www/copri-bike/$syshost/src";
+use strict;
+use warnings;
+use POSIX;
+use CGI;
+use Scalar::Util qw(looks_like_number);
+use Mod::DBtank;
+use Mod::APIsigclient;
+use Data::Dumper;
+
+my $q = new CGI;
+my $cf = new Config;
+my $dbt = new DBtank;
+my $si = new APIsigclient;
+my $bw = new Basework;
+my $lang = "de";
+my $now_dt = strftime "%Y-%m-%d %H:%M:%S", localtime;
+my %varenv = $cf->envonline();
+my $dbh = "";
+
+my $todo = $ARGV[1] || "";
+my $user_id = $ARGV[2] || "";
+my $sig_bike_id = $ARGV[3] || "";
+
+ open(FILE,">>$varenv{logdir}/APIsigclient.log");
+ print FILE "\n*** $now_dt 'sig_client fork with todo:$todo|user_id:$user_id|sig_bike_id:$sig_bike_id' \n";
+
+#get user and bike in copri by id
+my $apref = {
+ table => "contentadr",
+ fetch => "one",
+ template_id => "202",
+ c_id => "$user_id",
+ };
+my $ctadr = { c_id => 0 };
+$ctadr = $dbt->fetch_record($dbh,$apref) if($user_id =~ /^\d+$/ && $user_id > 0);
+
+my $ct_bike = { txt22 => "" };
+
+my $posref = {
+ table => "contenttranspos",
+ fetch => "one",
+ ca_id => "$ctadr->{c_id}",
+ int10 => "IN::('3','2')",
+ txt22 => "$sig_bike_id",
+ };
+my $ctpos = { c_id => 0 };
+$ctpos = $dbt->fetch_tablerecord($dbh,$posref) if($user_id =~ /^\d+$/ && $user_id > 0 && $sig_bike_id);
+
+print FILE "fetched from DB ctadr:$ctadr->{c_id}|ctpos:$ctpos->{c_id}\n";
+
+#only for tests
+if($todo eq "stations_available"){
+ $q->param(-name=>'request',-value=>"stations_available");
+ $ctadr = { c_id => 0 };
+ my $return = $si->sig_available($q,\%varenv,$ctadr);
+ #print $0 . Dumper($return) . "\n";
+}
+
+#only for tests
+if($todo eq "bikes_available"){
+ $q->param(-name=>'request',-value=>"bikes_available");
+ #$ctadr = { c_id => 0 };
+ my $return = $si->sig_available($q,\%varenv,$ctadr);
+ #print $0 . Dumper($return) . "\n";
+}
+
+#only for tests
+elsif($todo eq "reserve"){
+ #$ctadr = { c_id => 1842 };
+ #$ct_bike = { txt22 => "380116b5-0522-43da-ab66-477744a731a3" };
+ my $return = $si->sig_booking(\%varenv,$ctadr,$ct_bike,$ctpos,$todo);
+ #print $0 . Dumper($return) . "\n";
+}
+
+#used also live! to fork rental request with
+elsif($todo eq "rental" && $ctadr->{c_id} > 0 && $ctpos->{txt22}){
+ #$ctadr = { c_id => 1842 };
+ #$ct_bike = { txt22 => "380116b5-0522-43da-ab66-477744a731a3" };
+ my $return = $si->sig_booking(\%varenv,$ctadr,$ct_bike,$ctpos,$todo);
+ #print $0 . Dumper($return) . "\n";
+}
+
+#used also live! to fork rental_end request with "rentalId"
+elsif($todo eq "rental_end" && $ctadr->{c_id} > 0 && $ctpos->{txt11}){
+ my $return = $si->sig_booking(\%varenv,$ctadr,$ct_bike,$ctpos,$todo);
+ #print $0 . Dumper($return) . "\n";
+}
+
+else{
+ print FILE "failure::sig_client request not defined: $todo && $ctadr->{c_id} > 0 && $ctpos->{txt22}\n";
+ close(FILE);
+ exit 1;
+}
+
+close(FILE);
+
diff --git a/copri4/main/src/scripts/sigo_client.pl b/copri4/main/src/scripts/sigo_client.pl
deleted file mode 100755
index 74f9113..0000000
--- a/copri4/main/src/scripts/sigo_client.pl
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/perl
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-# Copyright (c) Rainer Gümpelein, TeilRad GmbH
-#
-# sudo su www-data -c "./src/scripts/sigo_client.pl shareeapp-sx available"
-#
-# sudo su www-data -c "./src/scripts/sigo_client.pl shareeapp-sx reserve"
-# sudo su www-data -c "./src/scripts/sigo_client.pl shareeapp-sx rental"
-#
-use vars qw($syshost);
-
-BEGIN {
- $syshost = $ARGV[0] || die 'syshost not defined';
-}
-
-use lib "/var/www/copri-bike/$syshost/src";
-use strict;
-use warnings;
-use POSIX;
-use CGI;
-use Mod::APIsigoclient;
-use Data::Dumper;
-
-my $q = new CGI;
-my $cf = new Config;
-my $si = new APIsigoclient;
-my $bw = new Basework;
-my $lang = "de";
-my $now_dt = strftime "%Y-%m-%d %H:%M:%S", localtime;
- my %varenv = $cf->envonline();
-
-my $todo = $ARGV[1];
-
-
-if($todo eq "available"){
- $q->param(-name=>'request',-value=>"bikes_available");
- my $auth = { c_id => 0 };
- my $return = $si->sigo_available($q,\%varenv,$auth);
- #print $0 . Dumper($return) . "\n";
-}
-
-if($todo eq "reserve"){
- my $auth = { c_id => 1842 };
- my $bike = { txt22 => "380116b5-0522-43da-ab66-477744a731a3" };# bike 1150
- #my $bike = "SX1150";# bike 1150 from app booking_request
- my $return = $si->sigo_booking(\%varenv,$auth,$bike,$todo);
- #print $0 . Dumper($return) . "\n";
-}
-
-if($todo eq "rental"){
- my $auth = { c_id => 1842 };
- my $bike = { txt22 => "380116b5-0522-43da-ab66-477744a731a3" };# bike 1150
- #my $bike = "SX1150";# bike 1150 from app booking_request
- my $return = $si->sigo_booking(\%varenv,$auth,$bike,$todo);
- #print $0 . Dumper($return) . "\n";
-}
-
diff --git a/copri4/shareeapp-operator/src/Lib/Mlogic.pm b/copri4/shareeapp-operator/src/Lib/Mlogic.pm
index ecae759..48151e3 100755
--- a/copri4/shareeapp-operator/src/Lib/Mlogic.pm
+++ b/copri4/shareeapp-operator/src/Lib/Mlogic.pm
@@ -43,9 +43,9 @@ sub tpl(){
my $coo = $q->cookie('domcookie') || $q->param('sessionid') || "";
#my $api_test = "sharee_kn";
- my $api_test = "sharee_fr01"; my $bike="FR1538";
+ #my $api_test = "sharee_fr01"; my $bike="FR1538";
#my $api_test = "sharee_wue";
- #my $api_test = "sharee_sx"; my $bike="S3X1001";
+ my $api_test = "sharee_sx"; my $bike="S3X1001";
#my $api_test = "sharee_ren"; my $bike="REN2";
print $q->div({-style=>'float:right;text-align:right;height:25px;padding:6px 15px;background-color:white'},$q->a({-style=>"background-color:#ffffff;color:#$bgcolor1;", -href=>"$varenv->{metahost}/src/scripts/tests/index.pl?sessionid=$coo\&api_test=$api_test\&bike=$bike", -target=>'_blank'}," [ tests --> $api_test ] "),"$users_sharee->{txt08}",$q->a({-style=>"color:#$bgcolor1;", -href=>"logout_sharee$session"},"logout")),"\n";