roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-02-22 11:46:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

Alarmjournal select rules

Browse source
This commit is contained in:
ragu 2022-11-21 12:21:39 +01:00
parent 941f8a04aa
commit f39ac77590
5 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
copri4/main/css/local_style20221106.css
View file

@ -742,7 +742,6 @@ div#Content4cal {
border: 0px solid gray;
margin: 0;
padding: 40px 5px 5px 0px;
min-width: 1400px;
min-height: 500px;
}

1
copri4/main/src/Mod/APIfunc.pm
View file

@ -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

13
copri4/main/src/Mod/Libenz.pm
View file

@ -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;
}

3
copri4/main/src/Mod/Shareework.pm
View file

@ -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"`);
}

24
copri4/main/src/Tpl/Calorin.pm
View file

@ -120,7 +120,7 @@ sub tpl(){
print $q->end_form;
print $q->start_form();
print "<div id='Content4cal'>\n";
print "<div id='Content4cal' style='min-width: 1400px;'>\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 .= " &rarr; lock-charge $cttpos->{$pid}->{int14} %" if($cttpos->{$pid}->{int14});
$charge .= " &rarr; 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 .= " &rarr; lock charge $cttpos->{$pid}->{int14} %" if($cttpos->{$pid}->{int14});
$user_device .= " &rarr; 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 .= " &rarr; $txt26" if($txt26);
@ -432,7 +440,7 @@ sub tpl(){
if($cttpos->{$pid}->{int26}){
$co2saving = $pri->co2calc($cttpos->{$pid});
$cttpos->{$pid}->{int26} =~ s/\./,/;
$track_info = "&rarr; - $co2saving kg CO&sup2; ($cttpos->{$pid}->{int26} km)";
$track_info = "&rarr; $co2saving kg CO&sup2; ($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 = "&rarr; $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 &rarr; $start_time &rarr; Nr. $bikenr &rarr; $kunde &rarr; $u_name/$u_name_end"),"\n";
print $q->div({-style=>"float:left;margin-left:$c_left"}, "$i) $edit_pos $pos_id &rarr; $start_time &rarr; Nr. $bikenr &rarr; $kunde &rarr; $u_name/$u_name_end $comment_view"),"\n";
}else{
print $q->div({-style=>"float:left;margin-left:$c_left"}, "$i) $edit_pos $pos_id &rarr; <span style='$time_style'>$start_time – $end_time</span> &rarr; $kunde &rarr; Start Station $start_station &rarr; End Station $end_station &rarr; Bike $bikenr $status $lock_state $track_info &rarr; $u_name/$u_name_end"),"\n";
#print $q->div({-style=>"float:left;margin-left:$c_left"}, "$i) $edit_pos $pos_id &rarr; Start $start_time Station $start_station &rarr; End $end_time Station $end_station &rarr; Bike $bikenr $status $lock_state $track_info &rarr; $kunde &rarr; $u_name/$u_name_end"),"\n";
print $q->div({-style=>"float:left;margin-left:$c_left"}, "$i) $edit_pos $pos_id &rarr; <span style='$time_style'>$start_time – $end_time</span> &rarr; $kunde &rarr; Start Station $start_station &rarr; End Station $end_station &rarr; Bike $bikenr $status $lock_state &rarr; $u_name/$u_name_end<br />$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;'}, "&rarr; 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;'}, " &rarr; $comment"),"\n" if($comment);
}elsif($node_meta->{ct_table} eq "contenttheftpos"){
my $speed = 0;