From f39ac775900f63de4aeb256aae00e1aff500bfcd Mon Sep 17 00:00:00 2001 From: ragu Date: Mon, 21 Nov 2022 12:21:39 +0100 Subject: [PATCH] Alarmjournal select rules --- copri4/main/css/local_style20221106.css | 1 - copri4/main/src/Mod/APIfunc.pm | 1 + copri4/main/src/Mod/Libenz.pm | 13 +++++++++---- copri4/main/src/Mod/Shareework.pm | 3 +-- copri4/main/src/Tpl/Calorin.pm | 24 ++++++++++++++++-------- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/copri4/main/css/local_style20221106.css b/copri4/main/css/local_style20221106.css index 0c3957b..aebbba7 100755 --- a/copri4/main/css/local_style20221106.css +++ b/copri4/main/css/local_style20221106.css @@ -742,7 +742,6 @@ div#Content4cal { border: 0px solid gray; margin: 0; padding: 40px 5px 5px 0px; - min-width: 1400px; min-height: 500px; } diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm index 503012f..a0b8979 100755 --- a/copri4/main/src/Mod/APIfunc.pm +++ b/copri4/main/src/Mod/APIfunc.pm @@ -533,6 +533,7 @@ sub service_update(){ my $update_pos = { table => "contenttranspos", mtime => "now()", + int27 => 1,#ok marker for rental end ack }; #update sig int28 counter diff --git a/copri4/main/src/Mod/Libenz.pm b/copri4/main/src/Mod/Libenz.pm index 9185ef9..2ce5762 100755 --- a/copri4/main/src/Mod/Libenz.pm +++ b/copri4/main/src/Mod/Libenz.pm @@ -271,7 +271,8 @@ sub month_line(){ } } - my $daymarker = $raster_mmpx * ($day_today - 0.5); + #my $daymarker = $raster_mmpx * ($day_today - 0.5); + my $daymarker = $raster_mmpx * $day_today; $daymarker .= "%"; return ($daymarker,$raster_mmpx,$day4month); @@ -308,10 +309,14 @@ sub rent_scale(){ } if(($year == $year_en) && ($mon == $mon_en)){ $doy_en = Day_of_Year($year_en,$mon_en,$day_en); - }elsif($year_en && $mon_en){ - my $month_days_en = Days_in_Month($year_en,$mon_en); - $doy_en = Day_of_Year($year_en,$mon_en,$month_days_en);# wenn ausserhalb --> cal_start + #}elsif($year_en && $mon_en){ + #my $month_days_en = Days_in_Month($year_en,$mon_en); + #$doy_en = Day_of_Year($year_en,$mon_en,$month_days_en); + }elsif($year && $mon){ + my $month_days_en = Days_in_Month($year,$mon); + $doy_en = Day_of_Year($year,$mon,$month_days_en);# wenn ausserhalb --> cal_start } + if(($mon != $mon_en) && ($mon != $mon_st)){ $doy_mon_st=0;$doy_mon_en=0;$doy_st=0;$doy_en=0; } diff --git a/copri4/main/src/Mod/Shareework.pm b/copri4/main/src/Mod/Shareework.pm index 51f0d1c..704b107 100755 --- a/copri4/main/src/Mod/Shareework.pm +++ b/copri4/main/src/Mod/Shareework.pm @@ -828,8 +828,7 @@ sub send_password(){ my $pwmd5 = md5_hex($coo); - #don't change/hassle pw on tester for ex. apple@sharee.bike|google@sharee.bike - if($email && $email !~ /$dbt->{copri_conf}->{test_accounts}/i){ + if($email && $email =~ /\w\@\w/ && $pwmd5 && length($pwmd5) > 20 && $email !~ /$dbt->{copri_conf}->{test_accounts}/i){ $db->updater("contentadr","1","1","txt11","$pwmd5","$owner","txt08","ilike","$email"); system(`$varenv{basedir}/src/Mod/newsletter_tink.pl "$varenv{basedir}" "$varenv{wwwhost}" "send_password" "$email" "$coo"`); } diff --git a/copri4/main/src/Tpl/Calorin.pm b/copri4/main/src/Tpl/Calorin.pm index 75ea78d..df785b8 100755 --- a/copri4/main/src/Tpl/Calorin.pm +++ b/copri4/main/src/Tpl/Calorin.pm @@ -120,7 +120,7 @@ sub tpl(){ print $q->end_form; print $q->start_form(); - print "
\n"; + print "
\n"; my $start_date_time = $R::start_date_time; my $end_date_time = $R::end_date_time; @@ -200,7 +200,12 @@ sub tpl(){ }elsif($node_meta->{ct_table} eq "contenttheftpos"){ #7=get_event alarm #8=get_position after validate - $search->{int10} = "IN::(7,8)" if(!$R::theft_details); + if(!$R::theft_details){ + $search->{int10} = "IN::(7,8)"; + $search->{int03} = ">::1";#move count + $search->{int07} = ">::1";#speed + $search->{int08} = ">::50";#meter + } $cttpos = $dbt->collect_theftpos($dbh,$search); } } @@ -395,11 +400,14 @@ sub tpl(){ } my $pos_id = "ID $cttpos->{$pid}->{c_id}"; my $user_device = ""; + my $charge = ""; + $charge .= " → lock-charge $cttpos->{$pid}->{int14} %" if($cttpos->{$pid}->{int14}); + $charge .= " → bike-charge $cttpos->{$pid}->{int19} %" if($cttpos->{$pid}->{int19}); #if($users_dms->{u_id} == $dbt->{copri_conf}->{bike_state}->{superu_id}){ if($users_dms->{u_id} && $users_dms->{u_id} =~ /1842|5781|11765|21618|38883/){ $pos_id = $q->div({-class=>"popup",-onclick=>"toggle_box('$pid')"},"$cttpos->{$pid}->{c_id}", $q->span({-class=>"popuptext",-id=>"$pid"},"$pos_details")); $user_device = ""; - $user_device .= " → lock charge $cttpos->{$pid}->{int14} %" if($cttpos->{$pid}->{int14}); + $user_device .= " → end-ack $cttpos->{$pid}->{int27}" if($cttpos->{$pid}->{int27}); my $txt26 = $cttpos->{$pid}->{txt26}; $txt26 = substr($cttpos->{$pid}->{txt26},0,25) if(length($cttpos->{$pid}->{txt26}) > 20); $user_device .= " → $txt26" if($txt26); @@ -432,7 +440,7 @@ sub tpl(){ if($cttpos->{$pid}->{int26}){ $co2saving = $pri->co2calc($cttpos->{$pid}); $cttpos->{$pid}->{int26} =~ s/\./,/; - $track_info = "→ - $co2saving kg CO² ($cttpos->{$pid}->{int26} km)"; + $track_info = "→ $co2saving kg CO² ($cttpos->{$pid}->{int26} km)"; } my $edit_pos = $q->a({-class=>"editboo",-href=>"?base_edit=transpos\&c_id=$cttpos->{$pid}->{c_id}\&owner=$users_dms->{u_id}",-title=>"Position bearbeiten ($cttpos->{$pid}->{c_id})"},$q->span({-class=>"bi bi-file-earmark-text-fill"})); @@ -446,6 +454,8 @@ sub tpl(){ my $comment = $cttpos->{$pid}->{txt23}; $comment = substr($cttpos->{$pid}->{txt23},0,50) . " ..." if(length($cttpos->{$pid}->{txt23}) > 50); + my $comment_view = ""; + $comment_view = "→ $comment" if($comment); my $kunde = "$cttpos->{$pid}->{txt08}"; if($users_dms_primary->{u_id} && $users_dms_primary->{int03} == 2){ @@ -455,17 +465,15 @@ sub tpl(){ #Gebühren und Gutscheine if($cttpos->{$pid}->{template_id} && $cttpos->{$pid}->{template_id} =~ /224|229/){ - print $q->div({-style=>"float:left;margin-left:$c_left"}, "$i) $edit_pos $pos_id → $start_time → Nr. $bikenr → $kunde → $u_name/$u_name_end"),"\n"; + print $q->div({-style=>"float:left;margin-left:$c_left"}, "$i) $edit_pos $pos_id → $start_time → Nr. $bikenr → $kunde → $u_name/$u_name_end $comment_view"),"\n"; }else{ - print $q->div({-style=>"float:left;margin-left:$c_left"}, "$i) $edit_pos $pos_id → $start_time – $end_time → $kunde → Start Station $start_station → End Station $end_station → Bike $bikenr $status $lock_state $track_info → $u_name/$u_name_end"),"\n"; - #print $q->div({-style=>"float:left;margin-left:$c_left"}, "$i) $edit_pos $pos_id → Start $start_time Station $start_station → End $end_time Station $end_station → Bike $bikenr $status $lock_state $track_info → $kunde → $u_name/$u_name_end"),"\n"; + print $q->div({-style=>"float:left;margin-left:$c_left"}, "$i) $edit_pos $pos_id → $start_time – $end_time → $kunde → Start Station $start_station → End Station $end_station → Bike $bikenr $status $lock_state → $u_name/$u_name_end
$track_info $charge $comment_view"),"\n"; } if($users_dms_primary->{u_id} && $users_dms_primary->{int03} == 2){ print $q->div({-style=>'float:left;margin-left:1em;'}, "→ Faktura", $q->a({-class=>"linknav3",-style=>"$trans_style",-href=>"/DMS/Faktura?ct_trans=open\&c_id4trans=$c_id4trans\&tpl_id4trans=$tpl_id4trans\&kind_of_trans=Faktura\&owner=$users_dms->{owner}",-title=>"Faktura Terminal öffnen"},"\#$ct_name")),"\n" if($c_id4trans && $tpl_id4trans); print $q->div({-style=>'float:left;margin-left:1em;'}, "$user_device"),"\n"; } - print $q->div({-style=>'float:left;margin-left:1em;'}, " → $comment"),"\n" if($comment); }elsif($node_meta->{ct_table} eq "contenttheftpos"){ my $speed = 0;