\n";
@@ -443,8 +443,8 @@ td {
if("$key" eq "ct_name"){
my $ct_pos = "";
if($cttpos->{$id}->{int09}){#if Tarif defined
- $ct_pos = "Endstation: $cttpos->{$id}->{txt13}$cttpos->{$id}->{int04}
" if($cttpos->{$id}->{int04});
- $ct_pos .= "Mietrad: $cttpos->{$id}->{ct_name}";
+ $ct_pos = "Mietrad: $cttpos->{$id}->{ct_name}";
+ $ct_pos .= "
Endstation: $cttpos->{$id}->{txt13}$cttpos->{$id}->{int04}" if($cttpos->{$id}->{int04});
}else{
$ct_pos = "$cttpos->{$id}->{ct_name}";
}
diff --git a/copri4/main/src/Tpl/TransPositionen.pm b/copri4/main/src/Tpl/TransPositionen.pm
index 863fee9..870eaa5 100755
--- a/copri4/main/src/Tpl/TransPositionen.pm
+++ b/copri4/main/src/Tpl/TransPositionen.pm
@@ -145,7 +145,7 @@ EOF
my ($key,$val) = split /=/,$_;
$k++ if($val);
if($key eq "ct_name"){
- print $q->th($q->textfield(-class=>'etxt',-style=>'height:19px;width:140px;font-size:1.3em;text-align:right;',-id=>"json_select",-name=>"json_select",-value=>"", -override=>'1',-size=>"25",-maxlength=>50, -placeholder=>'Nummer',-autofocus=>1),"");
+ print $q->th($q->textfield(-class=>'etxt',-style=>'height:19px;width:140px;font-size:1.3em;text-align:right;',-id=>"json_select",-name=>"json_select",-value=>"", -override=>'1',-size=>"25",-maxlength=>50, -placeholder=>'Nummer'),"");
}elsif($key =~ /int|txt|time\d+/){
print $q->th("$val");
}
@@ -263,7 +263,7 @@ EOF
if($cttpos->{$id}->{int35} && $cttpos->{$id}->{start_time} && $cttpos->{$id}->{end_time}){
print $q->td({-class=>'tdint', -nowrap=>1},"$pricing->{real_clock} $pricing->{freed_time}"),"\n";
}else{
- print $q->td({-colspan=>'1',-class=>'element',-style=>"$txtstyle $set_style"},$q->textfield(-class=>'etxt',-style=>"$txtstyle",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-size=>"$isize",-maxlength=>10, -autofocus=>1)),"\n";
+ print $q->td({-colspan=>'1',-class=>'element',-style=>"$txtstyle $set_style"},$q->textfield(-class=>'etxt',-style=>"$txtstyle",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-size=>"$isize",-maxlength=>10)),"\n";
}
}elsif($key =~ /int02/){
if($cttpos->{$id}->{int35} && $cttpos->{$id}->{start_time} && $cttpos->{$id}->{end_time}){
@@ -290,7 +290,7 @@ EOF
my ($e_yy,$e_mo,$e_dd,$e_hh,$e_mi) = $lb->split_date($cttpos->{$id}->{end_time});
print "";
- print $q->textarea(-class=>'autos',-style=>"border: 1px solid #ededed;background-color: #ededed;",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-rows=>"1",-cols=>65),"
\n";
+ print $q->textarea(-class=>'autos',-style=>"border: 1px solid #ededed;background-color: #ededed;",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-rows=>"1",-cols=>65, -autofocus=>1),"
\n";
#if Traiff Nr.
if($cttpos->{$id}->{int09}){
diff --git a/copri4/main/src/scripts/tests b/copri4/main/src/scripts/tests
new file mode 120000
index 0000000..cf562f8
--- /dev/null
+++ b/copri4/main/src/scripts/tests
@@ -0,0 +1 @@
+../../../../../sharee.bike/copri-bike/main/src/scripts/tests
\ No newline at end of file
diff --git a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
index 0368e47..8042689 100755
--- a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
+++ b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm
@@ -167,19 +167,19 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit
my $sharee_agb_text = {};
$sharee_agb_text->{ct_name} = "AGB";
$sharee_agb_text->{txt01} = "";
- #if($aowner == 195 || $aowner == 185 || $aowner == 176){
+ my $sharee_privacy_text = {};
+ $sharee_privacy_text->{ct_name} = "Datenschutzhinweise";
+ $sharee_privacy_text->{txt01} = "";
+
if($project eq "Konstanz"){
$sharee_agb_text->{txt01} = "";
}
if($project eq "Bayern"){
$sharee_agb_text->{txt01} = "";
+ $sharee_privacy_text->{txt01} = "";
}
- my $sharee_privacy_text = {};
- $sharee_privacy_text->{ct_name} = "Datenschutzhinweise";
- $sharee_privacy_text->{txt01} = "";
-
print "\n";
print < |