EOF
;
-}
print $q->start_table({-class=>'list', -border=>'0', -width=>'100%',-align=>'left', -cellpadding=>'3', -cellspacing=>'0'});
diff --git a/copri4/main/src/scripts/tests/index.pl b/copri4/main/src/scripts/tests/index.pl
index 7066e9d..7cd0f8a 100755
--- a/copri4/main/src/scripts/tests/index.pl
+++ b/copri4/main/src/scripts/tests/index.pl
@@ -175,7 +175,11 @@ if($operator_key eq "sharee_kn"){
$latitude = "47.66267";
$longitude = "9.17262";
}
-
+if($operator_key eq "sharee_wue"){
+ $bike = "WUE5529";
+ $latitude = "47.997930";
+ $longitude = "7.785428";
+}
print $q->div({-style=>'margin:15px;'},"-------------- $uriop --------------------"),"\n";
my $booking_request = "$uriop?request=booking_request&bike=$bike&authcookie=$coo";
print $q->div({-style=>'margin:15px;'},$q->a({-target=>'_blank', -href=>"$booking_request"},"[ booking_request ]---> $booking_request")),"\n";
@@ -199,6 +203,9 @@ print $q->div({-style=>'margin:15px;'},$q->a({-target=>'_blank', -href=>"$bookin
my $booking_update_av_lo = "$uriop?request=booking_update&bike=$bike&state=available&lock_state=locked$and_station_state_locked&latitude=$latitude&longitude=$longitude&gps_age=300&user_device_manufaturer=samsung)&user_device_model=SM-G398FN&user_device_platform=Android&user_device_version=10&user_device_id=90af86831c10374d&authcookie=$coo";
print $q->div({-style=>'margin:15px;'},$q->a({-target=>'_blank', -href=>"$booking_update_av_lo"},"[ booking_update_av_lo ]---> $booking_update_av_lo")),"\n";
+my $booking_update_av_lo_nogps = "$uriop?request=booking_update&bike=$bike&state=available&lock_state=locked$and_station_state_locked&user_device_manufaturer=samsung)&user_device_model=SM-G398FN&user_device_platform=Android&user_device_version=10&user_device_id=90af86831c10374d&authcookie=$coo";
+print $q->div({-style=>'margin:15px;'},$q->a({-target=>'_blank', -href=>"$booking_update_av_lo_nogps"},"[ booking_update_av_lo_nogps ]---> $booking_update_av_lo_nogps")),"\n";
+
my $user_feedback = "$uriop?request=user_feedback&bike=$bike&bike_broken=1&message=testnachricht äöü&authcookie=$coo";
print $q->div({-style=>'margin:15px;'},$q->a({-target=>'_blank', -href=>"$user_feedback"},"[ user_feedback ]---> $user_feedback")),"\n";
diff --git a/copri4/shareeapp-operator/src/Tpl/Contact.pm b/copri4/shareeapp-operator/src/Tpl/Contact.pm
index c76d53a..ccf4816 100755
--- a/copri4/shareeapp-operator/src/Tpl/Contact.pm
+++ b/copri4/shareeapp-operator/src/Tpl/Contact.pm
@@ -59,10 +59,13 @@ sub tpl(){
$session_and = "&sessionid=$R::sessionid";
}
- my $project = "all";
+ my $project = "";#project dependent operator contact match
+ my $oprefix = "";#single operator contact match
$project = "Freiburg" if($varenv->{syshost} eq "shareeweb-sharee");
$project = "Bayern" if($varenv->{syshost} eq "shareeweb-bayern");
$project = "Konstanz" if($varenv->{syshost} eq "shareeweb-konstanz");
+ $oprefix = "REN" if($varenv->{syshost} eq "shareeweb-ren");
+
my $sort_updown = "up";
my $content2 = "content2_contact";
@@ -82,7 +85,8 @@ sub tpl(){
#BIG LOOP content table
#while (my ($mandant_conf, $value) = each %{ $dbt->{operator} }) {
foreach my $m_id (sort { $dbt->{operator}->{$b}->{oprefix} cmp $dbt->{operator}->{$a}->{oprefix} } keys(%{ $dbt->{operator} })) {
- if($dbt->{operator}->{$m_id}->{project} eq $project || $project eq "all"){
+ #if($dbt->{operator}->{$m_id}->{project} eq $project || $project eq "all"){
+ if($dbt->{operator}->{$m_id}->{oprefix} eq $oprefix || $dbt->{operator}->{$m_id}->{project} eq $project){
print $q->div({-class=>"$content2"}," "),"\n";
my $sharee_operator = $dbt->{operator}->{$m_id}->{database}->{dbname};
@@ -96,7 +100,10 @@ sub tpl(){
$record_cc->{$key} = $lb->newline($record_cc->{$key},"","");
if($key =~ /ct_name/){
- print $q->div({-id=>"$record_cc->{c_id}",-class=>'content_title2'},"• $record_cc->{$key}"),"\n";
+ #print $q->div({-id=>"$record_cc->{c_id}",-class=>'content_title2'},"• $record_cc->{$key}"),"\n";
+ my $title = "$record_cc->{$key}";
+ $title = "$dbt->{operator}->{$m_id}->{title}";# if($dbt->{operator}->{$m_id}->{oprefix} eq $oprefix);
+ print $q->div({-id=>"$record_cc->{c_id}",-class=>'content_title2'},"• $title"),"\n";
}elsif($key =~ /txt|int/ && $record_cc->{$key} && $key !~ /txt85/){
#phone tag
if($record_cc->{$key} =~ /\d+$/ && $des =~ /hotline|Telefon|phone/i){
diff --git a/copri4/shareedms-operator/src/Lib/Mlogic.pm b/copri4/shareedms-operator/src/Lib/Mlogic.pm
index e3e31ea..0a5168f 100755
--- a/copri4/shareedms-operator/src/Lib/Mlogic.pm
+++ b/copri4/shareedms-operator/src/Lib/Mlogic.pm
@@ -60,7 +60,7 @@ sub tpl(){
$title .= $dbt->{operator}->{$varenv->{dbname}}->{title} if($dbt->{operator}->{$varenv->{dbname}}->{title});
$title .= " " . $dbt->{operator}->{$varenv->{dbname}}->{oprefix} if($dbt->{operator}->{$varenv->{dbname}}->{oprefix});
$title .= $dbt->{website}->{$varenv->{syshost}}->{title} if($dbt->{website}->{$varenv->{syshost}}->{title});
- $title .= " (DEVEL $varenv->{dbname})" if($dbt->{copri_conf}->{stage} eq "test");
+ $title .= " (devel $varenv->{dbname})" if($dbt->{copri_conf}->{stage} eq "test");
###User Panel
@@ -253,30 +253,24 @@ sub tpl(){
my $big2menu="";
#while (my ($key, $value) = each %{ $dbt->{operator} }) {
foreach my $key (sort keys (%{ $dbt->{operator} })) {
- $big2menu .= $but->lia_button("$dbt->{operator}->{$key}->{operatorDMS}","$key","","","","");
+ $big2menu .= $but->lia_button("$dbt->{operator}->{$key}->{operatorDMS}?merchant_id=$dbt->{operator}->{$key}->{merchant_id}","DMS $key","","","color:#$dbt->{operator}->{$key}->{bgcolor1};","") if($dbt->{operator}->{$key}->{merchant_id});
}
foreach my $key (sort keys (%{ $dbt->{website} })) {
- $big2menu .= $but->lia_button("$dbt->{website}->{$key}->{operatorWeb}","$key","","","","");
+ $big2menu .= $but->lia_button("$dbt->{website}->{$key}->{operatorWeb}","Web $key","","","color:#$dbt->{website}->{$key}->{bgcolor1};","") if($dbt->{website}->{$key}->{merchant_id});
+ }
+ foreach my $key (sort keys (%{ $dbt->{appsframe} })) {
+ $big2menu .= $but->lia_button("$dbt->{primary}->{sharee_primary}->{primaryApp}?request=authorization&authcookie=$dbt->{appsframe}->{$key}->{merchant_id}","App $key","","","color:#$dbt->{merchant_ids}->{$dbt->{appsframe}->{$key}->{merchant_id}}->{bgcolor1};","");
}
- #foreach my $key (sort keys (%{ $dbt->{operator} })) {
- # $big2menu .= $but->lia_button("$dbt->{operator}->{$key}->{operatorApp}","$key","","","","");
- #}
- print $q->div({-style=>'width:100%;margin:0;padding-top:90px;color:white;'}, "sharee.bike Operatoren"),"\n";
+ print $q->div({-style=>'width:100%;margin:0;padding-top:70px;color:white;'}, ""),"\n";
print $q->div({-style=>'width:100%;margin:0;'}, $q->ul({-id=>'BigNavi'},$big2menu)),"\n";
}
- print "\n";
- #lefsitemenue disabled 2021-06.03
- print "
\n";
-
-
$debug = "syshost: $varenv->{syshost}, merchant_id: $varenv->{merchant_id}, (c_id4trans:$users_dms->{c_id4trans} && tpl_id4trans:$users_dms->{tpl_id4trans} && kind_of_trans:$users_dms->{kind_of_trans}) $node_meta->{tpl_name},$node_meta->{tpl_id},$node_meta->{ct_table},$parent_id,$main_id, permissions: ($users_dms->{int01},$users_dms->{int02},$users_dms->{int03},$users_dms->{int07},$users_dms->{int08},$users_dms->{int09})" if($users_dms->{u_id} == $dbt->{copri_conf}->{superu_id});
print $q->div({-style=>'position:fixed;bottom:0%;right:1%;z-index:10;padding:2px;font-size:13px;'},"$debug",$q->a({-style=>'color:black;text-decoration: none;',-href=>'https://sharee.bike',-target=>'_blank'},"sharee.bike © TeilRad GmbH 2021")),"\n";
#update c_id4trans on changing browser tab 2019-10-08
-#FIXME, we need all $R::c_id4trans,$R::tpl_id4trans,$R::kind_of_trans
if(1==2 && $mode eq "manager"){
print<
@@ -307,7 +301,7 @@ document.addEventListener('visibilitychange', function () {
EOF
;
}
-
+ print $q->div({-style=>'padding: 30px 0 0 0;'}, ""), "\n";
$self->tplselect($node_meta,$users_dms,$mode,$varenv,$return);
print "\n";
}#end logedin environment
diff --git a/copri4/shareeweb-project/src/Lib/Mlogic.pm b/copri4/shareeweb-project/src/Lib/Mlogic.pm
index 05631c8..ed9f371 100755
--- a/copri4/shareeweb-project/src/Lib/Mlogic.pm
+++ b/copri4/shareeweb-project/src/Lib/Mlogic.pm
@@ -48,7 +48,8 @@ sub tpl(){
if($users_sharee->{c_id} eq $varenv->{superu_id} || $dbt->{copri_conf}->{stage} eq "test"){
my $coo = $q->cookie('domcookie') || $q->param('sessionid') || "";
#my $api_test = "sharee_kn";
- my $api_test = "sharee_fr01";
+ #my $api_test = "sharee_fr01";
+ my $api_test = "sharee_wue";
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", -target=>'_blank'}," [ tests --> $api_test ] ")),"\n";
}