From 782bf6a153ea809346f92ce2e0835248a169cd01 Mon Sep 17 00:00:00 2001 From: ragu Date: Fri, 3 Jun 2022 06:21:28 +0200 Subject: [PATCH] new rental editor minor changes --- copri4/main/src/Mod/APIfunc.pm | 5 ++--- copri4/main/src/Mod/Prelib.pm | 3 +++ copri4/main/src/Tpl/BaseEdit.pm | 16 +++++++--------- copri4/main/src/Tpl/Calorin.pm | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm index 314134f..ab95c00 100755 --- a/copri4/main/src/Mod/APIfunc.pm +++ b/copri4/main/src/Mod/APIfunc.pm @@ -1792,11 +1792,10 @@ sub bikes_available(){ if(ref($tariff_content) eq "HASH"){ foreach my $tid (sort { $tariff_content->{$a}->{barcode} <=> $tariff_content->{$b}->{barcode} } keys (%$tariff_content)){ - #$bw->log("bikes_available tariff_content tariff_description $tariff_content->{$tid}->{int12} && $auth->{txt30} =~ /$tariff_content->{$tid}->{barcode}/ BIKE:",$return->{$id}->{bike},""); foreach(@adr_tariff){ if($record->{$id}->{main_id} == $tariff_content->{$tid}->{int12} && $_ == $tariff_content->{$tid}->{barcode}){ - $bw->log("bikes_available for user c_id: $auth->{c_id} if($record->{$id}->{main_id} == $tariff_content->{$tid}->{int12} && $_ == $tariff_content->{$tid}->{barcode}) on BIKE:",$return->{$id}->{bike},""); + #$bw->log("bikes_available for user c_id: $auth->{c_id} if($record->{$id}->{main_id} == $tariff_content->{$tid}->{int12} && $_ == $tariff_content->{$tid}->{barcode}) on BIKE:",$return->{$id}->{bike},""); #deprecated $return->{$id}->{tariff_description}->{name} = "$tariff_content->{$tid}->{ct_name}"; @@ -1946,7 +1945,7 @@ sub stations_available(){ my $station_group = ""; $station_group = $record_pos->{int12} if(ref($record_pos) eq "HASH" && $record_pos->{int12}); - $bw->log("stations_available by station_group: $station_group",$record_pos,""); + #$bw->log("stations_available by station_group: $station_group",$record_pos,""); my $authed = 0; $authed = 1 if(ref($auth) eq "HASH" && $auth->{c_id}); diff --git a/copri4/main/src/Mod/Prelib.pm b/copri4/main/src/Mod/Prelib.pm index 69aa64c..3ea5922 100755 --- a/copri4/main/src/Mod/Prelib.pm +++ b/copri4/main/src/Mod/Prelib.pm @@ -139,6 +139,9 @@ sub save_contenttranspos { $update_pos->{int10} = $R::int10 if(looks_like_number($R::int10)); $update_pos->{int20} = $R::int20 if(looks_like_number($R::int20)); $update_pos->{int04} = $R::int04 if(looks_like_number($R::int04)); + + $update_pos->{txt01} = $q->escapeHTML($R::txt01) if($R::txt01); + $update_pos->{txt23} = $q->escapeHTML($R::txt23) if($R::txt23); #before update bike content check if realy last rental my $pref2ck = { diff --git a/copri4/main/src/Tpl/BaseEdit.pm b/copri4/main/src/Tpl/BaseEdit.pm index 4f3bd6e..c099e17 100755 --- a/copri4/main/src/Tpl/BaseEdit.pm +++ b/copri4/main/src/Tpl/BaseEdit.pm @@ -308,15 +308,17 @@ EOF print $q->Tr(),"\n"; print $q->td({-class=>'left_italic_cms'},"$des"),"\n"; print $q->td({-class=>'content1_cms'}, $q->b("$cttpos->{$key}")),"\n"; - }elsif($key =~ /txt01/){ + }elsif($key =~ /txt/ && $size eq "area"){ + $cttpos->{$key} = $q->unescapeHTML("$cttpos->{$key}"); + $cttpos->{$key} = $lb->newline($cttpos->{$key},"",1); print $q->Tr(),"\n"; print $q->td({-class=>'left_italic_cms'},"$des"),"\n"; - if($cttpos->{int09} && $cttpos->{$key} !~ /Manuell/){ + if($key eq "txt01" && $cttpos->{int09} && $cttpos->{$key} !~ /Manuell/){ $cttpos->{$key} .= "\nManuell bearbeitet\n"; } print ""; - print $q->textarea(-class=>'autos',-style=>"border: 1px solid #ededed;",-name=>"$key",-default=>"$cttpos->{$key}", -override=>'1',-rows=>"1",-cols=>45, -autofocus=>1),"
\n"; + print $q->textarea(-class=>'autos',-style=>"border: 1px solid silver;",-name=>"$key",-default=>"$cttpos->{$key}", -override=>'1',-rows=>"1",-cols=>50),"\n"; print "\n"; @@ -364,11 +366,9 @@ EOF foreach my $s_key (sort keys (%{ $dbt->{copri_conf}->{lock_state} })) { push @_lock_valxx, "$s_key:$dbt->{copri_conf}->{lock_state}->{$s_key}"; } - my $sys_comment = ""; - $sys_comment = "Realer Schliesszustand kann nur am Mietrad gesteuert werden!" if($cttpos->{int11} == 2); print $q->Tr(); print $q->td({-class=>'left_italic_cms'},"$des"),"\n"; - print $q->td({-class=>'content1_cms',-colspan=>'2'},$but->selector_class("$key","eselect","",$cttpos->{$key},@_lock_valxx),"$sys_comment"); + print $q->td({-class=>'content1_cms',-colspan=>'2'},$but->selector_class("$key","eselect","",$cttpos->{$key},@_lock_valxx),"$postdes"); }elsif($key eq "int26"){ if($cttpos->{int26}){ @@ -593,11 +593,9 @@ EOF foreach my $s_key (sort keys (%{ $dbt->{copri_conf}->{lock_state} })) { push @_lock_valxx, "$s_key:$dbt->{copri_conf}->{lock_state}->{$s_key}"; } - my $sys_comment = ""; - $sys_comment = "Realer Schliesszustand kann nur am Mietrad gesteuert werden!" if($ctrel->{int11} == 2); print $q->Tr(); print $q->td({-class=>'left_italic_cms'},"$des"),"\n"; - print $q->td({-class=>'content1_cms',-colspan=>'2'},$but->selector_class("$key","eselect","",$ctrel->{$key},@_lock_valxx),"$sys_comment"); + print $q->td({-class=>'content1_cms',-colspan=>'2'},$but->selector_class("$key","eselect","",$ctrel->{$key},@_lock_valxx),"$postdes"); } elsif($key =~ /int11/ && "$size" eq "select" && $node_meta->{tpl_id} == 205){#lock_system BC Ilockit usw my @_lock_valxx = (); diff --git a/copri4/main/src/Tpl/Calorin.pm b/copri4/main/src/Tpl/Calorin.pm index aac72f8..31c6792 100755 --- a/copri4/main/src/Tpl/Calorin.pm +++ b/copri4/main/src/Tpl/Calorin.pm @@ -373,7 +373,7 @@ sub tpl(){ #if($ct_name){ if(1==1){ - print "\n"; + print "\n"; my $pos_hash = $cttpos->{$pid}; my $pos_details = "";