roko.li/sharee.bike
4
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2024-05-04 08:56:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

minor refactoring some buttons and styles

Browse source
This commit is contained in:
ragu 2022-12-06 19:57:49 +01:00
parent ad478aa3ee
commit 003df87598
23 changed files with 64 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
copri4/main/css/local_style20221106.css → copri4/main/css/local_style20221205.css
View file

@ -535,6 +535,7 @@ div#Oline {
vertical-align: top;
text-align: left;
min-width:45px;
max-width:500px;
font-size:0.81em;
background-color:white;
border-right: solid thin silver;
@ -787,9 +788,8 @@ div#Container_txt1 {
.sortnav:hover { color:#dcd77f;}
.editboo {
font-size: 1.5em;
color: black;
padding:0 2px;
padding:0px 3px;
vertical-align:middle;
text-decoration: none;
}

1
copri4/main/glyphicons
View file

@ -1 +0,0 @@
/etc/shareeconf/glyphicons

1
copri4/main/js/iframeResizer.contentWindow.min.js vendored
View file

@ -1 +0,0 @@
/etc/shareeconf/iframeResizer.contentWindow.min.js

1
copri4/main/js/iframeResizer.min.js vendored
View file

@ -1 +0,0 @@
/etc/shareeconf/iframeResizer.min.js

1
copri4/main/js/jquery.autosize.js
View file

@ -1 +0,0 @@
/etc/shareeconf/jquery.autosize.js

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

@ -1192,7 +1192,8 @@ sub booking_update(){
c_id => "$record_pos->{c_id}",
};
$record_pos = $dbt->fetch_tablerecord($dbh,$booking_pos);
$bw->log("smartlock lock_state $lock_state | int10 $record_pos->{int10} | int20 $record_pos->{int20}",$booking_values,"");
my $if_gps = $gps_data->{gps} || "";
$bw->log("smartlock lock_state $bike $lock_state | int10 $record_pos->{int10} | int20 $record_pos->{int20} | if_gps $if_gps",$booking_values,"");
}
@ -1468,7 +1469,6 @@ sub booking_update(){
}
my $co2saving = "";
$booking->{int26} = 10 if(!$booking->{int26} && ($auth->{c_id} == 1842 || $auth->{c_id} == 1843 || $auth->{c_id} == 5781 || $auth->{c_id} == 11765 || $auth->{c_id} == 38883));#10 km test
if($booking->{int26}){
$co2saving = "Einsparung: ";
my $co2diff = $pri->co2calc($booking);
@ -2003,12 +2003,11 @@ sub bikes_all(){
keyfield => "barcode",#2018-02-21 changed to bike id
template_id => "205",#Leihrad_liste
};
#int10 => "!=::3",#changed to select also occupied bikes in servicetool
my ($bike_group,$bike_node,$user_tour,$tariff_content,$adrtarif_hash) = $self->fetch_tariff($varenv->{dbname},$auth,$q->param('authcookie'));
my $main_ids = join(",",@{$bike_node});
$main_ids =~ s/[a-z_]+//ig;
$pref = { %$pref, main_id => "IN::($main_ids)" };
$pref->{main_id} = "IN::($main_ids)";
my $station_id = "";
my $bike_id = "";
@ -2016,7 +2015,10 @@ sub bikes_all(){
$station_id = $1 if($q->param('station') =~ /(\d+)/);
$bike_id = $1 if($q->param('bike') && $q->param('bike') =~ /(\d+)/);
$pref->{int04} = "=::$station_id" if(looks_like_number($station_id));
$pref->{ barcode} = "=::$bike_id" if(looks_like_number($bike_id));
if(looks_like_number($bike_id)){
$pref->{ barcode} = "=::$bike_id";
$pref->{int10} = "!=::3";#2022-12-02 do not select occupied bikes in servicetool by direct bike-select
}
my $record = {};
#on servicetool only stations on user_tour

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

@ -260,8 +260,7 @@ sub sig_available {
$response_out->{$bike}->{rental_description}->{name} = "$tariff_content->{$tid}->{ct_name}";
$response_out->{$bike}->{rental_description}->{id} = "$tariff_content->{$tid}->{barcode}";
$response_out->{$bike}->{rental_description}->{reserve_timerange} = "30";
$response_out->{$bike}->{rental_description}->{rental_info}->{1} = ["Tracking","Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!"];#TODO if($resp->{gps_tracker_id});
#$response_out->{$bike}->{rental_description}->{rental_info}->{2} = ["AGB","Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt (als Demo sharee AGB)."] if($ctadr->{c_id} && ($ctadr->{c_id} == 1842 || $ctadr->{c_id} == 1843 || $ctadr->{c_id} == 5781 || $ctadr->{c_id} == 11765 || $ctadr->{c_id} == 38883));
$response_out->{$bike}->{rental_description}->{rental_info}->{1} = ["Tracking","Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!"];# if($resp->{gps_tracker_id});
my $i = 0;
foreach my $td (sort keys (%$td_template)){

2
copri4/main/src/Mod/Basework.pm
View file

@ -75,7 +75,7 @@ print<<EOF
EOF
;
my $debug = "";
$debug = $feedb->{debug} if($users_dms->{u_id} eq "1842");
#$debug = $feedb->{debug};
if($feedb->{message} =~ /(failure::.*)/){
$return = $1;

129
copri4/main/src/Mod/Buttons.pm
View file

@ -568,19 +568,6 @@ sub singlesubmit1(){
return $button;
}
# with counter field
sub singlesubmit6(){
my $self = shift;
my ($function,$b_name,$counter) = @_;
%ib = &ibuttons("","$counter");
my ($key,$val,$ibv);
while (($key,$val) = each(%ib)) {
#print "$val if($b_name eq $key) <br>";
$ibv = $val if($b_name eq $key);
}
my $button = "<input type='submit' class='ebutton' name='$function' value='$ibv'>";
return $button;
}
sub singlesubmit3(){
my $self = shift;
@ -649,136 +636,52 @@ sub singlesubmit7(){
return $button;
}
#without submit
sub singlesubmit17(){
my $self = shift;
my ($function,$b_name,$title,$set_style,$jscript,$ebutton) = @_;
$ebutton = "ebutton" if(!$ebutton);
my ($b_img,$a_key);
$b_img = "Barcode" if("$b_name" =~ /barcode/);
$b_img = "Copy" if("$b_name" =~ /copy/);
$b_img = "Relate" if("$b_name" =~ /relate/);
$b_img = "Move" if("$b_name" =~ /move_/);
$b_img = "Delete" if("$b_name" =~ /delete|remove/);
$b_img = "Delete" if("$b_name" =~ /delete_media/);
$b_img = "Save" if("$b_name" =~ /save/);
$a_key = "y" if("$b_name" =~ /save/);
$b_img = "Text Save" if("$b_name" =~ /save_text/);
$b_img = "Delete All" if("$b_name" =~ /delete_all/);
$b_img = "Search" if("$b_name" =~ /search/);
$b_img = "New" if("$b_name" =~ /^new/);
$b_img = "Open" if("$b_name" eq "open");
$b_img = "Close" if("$b_name" eq "close");
$b_img = "Print" if("$b_name" eq "print_sheet");
$b_img = "Change Login" if("$b_name" eq "change_login");
$b_img = "Senden" if("$b_name" =~ /send_newsletter/);
$b_img = "XLS Export" if("$b_name" =~ /XLSout/);
$b_img = "Save & Close" if("$b_name" =~ /_and_close/);
$b_img = "Save & Close & Print " if("$b_name" =~ /_print_and_close/);
$b_img = "Print" if("$b_name" =~ /_print_only/);
$b_img = "Kunde" if("$b_name" =~ /client/);
$b_img = "Artikel" if("$b_name" =~ /part/);
my $button = "<span style='width:25px;height=15px;'>&nbsp;</span>";
if($b_name){
$button = "<div onClick='javascript:$jscript' class='$ebutton' style='$set_style' name='$function' value='$b_name' title='$title'>$b_img</div>";
}
return $button;
}
# Grafic Submit Buttons
sub singlesubmit2glyph(){
my $self = shift;
my ($function,$b_name,$title,$set_style,$jscript) = @_;
my $b_img; my $a_key;
$b_img = "submit.png" if("$b_name" =~ /post_email/);
$b_img = "actions/view-barcode.png" if("$b_name" =~ /barcode/);
$b_img = "actions/edit-copy.png" if("$b_name" =~ /copy|relate/);
$b_img = "actions/edit-paste.png" if("$b_name" =~ /move_/);
$b_img = "glyphicons/glyphicons-151-edit.png" if("$b_name" =~ /delete|remove/);
$b_img = "actions/edit-delete.png" if("$b_name" =~ /delete_media/);
$b_img = "actions/document-save.png" if("$b_name" =~ /save/);
my $a_key = "";
$a_key = "y" if("$b_name" =~ /save/);
$b_img = "edittrash.png" if("$b_name" =~ /delete_all/);
$b_img = "search.png" if("$b_name" =~ /search/);
$b_img = "glyphicons/glyphicons-151-edit.png" if("$b_name" =~ /_done|_contenttverpos/);
$b_img = "glyphicons/glyphicons-703-file-plus.png" if("$b_name" =~ /new/);
$b_img = "glyphicons/glyphicons-151-edit.png" if("$b_name" =~ /open|client/);
$b_img = "fileclose.png" if("$b_name" eq "close");
$b_img = "actions/view-media-artist.png" if("$b_name" eq "change_login");
my $b_img = "";
$b_img = "<span class='bi bi-check-circle' style='font-size:1.5em;'</span>" if("$b_name" =~ /save/);
$b_img = "<span class='bi bi-x-circle' style='font-size:1.5em;'</span>" if("$b_name" =~ /delete|remove/);
$b_img = "<span class='bi bi-file-earmark-plus-fill' style='font-size:1.5em;'</span>" if("$b_name" =~ /new/);
$b_img = "<span class='bi bi-file-earmark-text-fill' style='font-size:1.5em;'</span>" if("$b_name" =~ /open|client/);
my $button = "<span style='width:25px;height=15px;'>&nbsp;</span>";
if($b_name){
if("$b_name" =~ /delete/ && "$b_name" !~ /delete_verposdate/){
if("$b_name" =~ /delete/){
if($jscript){
$button = "<button type='submit' onClick=\"javascript:$jscript; return confirm('Wirklich löschen?')\" style='width:25px;height=15px; border: 0px solid;$set_style' name='$function' value='$b_name' title='$title'><img src='$varenv{metahost}/$b_img' style='height:18px;' /></button>";
$button = "<button type='submit' onClick=\"javascript:$jscript; return confirm('Wirklich löschen?')\" style='width:25px;height=15px; border: 0px solid;$set_style' name='$function' value='$b_name' title='$title'>$b_img</button>";
}else{
$button = "<button type='submit' onClick=\"return confirm('Wirklich löschen?')\" style='width:25px;height=15px; border: 0px solid;$set_style' name='$function' value='$b_name' title='$title'><img src='$varenv{metahost}/$b_img' style='height:18px;' /></button>";
$button = "<button type='submit' onClick=\"return confirm('Wirklich löschen?')\" style='width:25px;height=15px; border: 0px solid;$set_style' name='$function' value='$b_name' title='$title'>$b_img</button>";
}
}else{
$button = "<button type='submit' style='border: 0px solid;$set_style' name='$function' value='$b_name' title='$title' accesskey='$a_key'><img src='$varenv{metahost}/$b_img' style='height:18px;' /></button>";
$button = "<button type='submit' style='border: 0px solid;$set_style' name='$function' value='$b_name' title='$title' accesskey='$a_key'>$b_img</button>";
}
}
return $button;
}
# Grafic Submit Buttons
#Submit Buttons
sub singlesubmit2(){
my $self = shift;
my ($function,$b_name,$title,$set_style,$jscript) = @_;
my $b_img; my $a_key;
$b_img = "glyphicons-446-floppy-remove.png" if("$b_name" =~ /delete|remove/);
$b_img = "glyphicons-445-floppy-saved.png" if("$b_name" =~ /save/);
my $a_key = "";
$a_key = "y" if("$b_name" =~ /save/);
my $button = "<span style='width:25px;height=15px;'>&nbsp;</span>";
if($b_name){
if("$b_name" =~ /delete/ && "$b_name" !~ /delete_verposdate/){
if("$b_name" =~ /delete/){
if($jscript){
$button = "<button type='submit' onClick=\"javascript:$jscript; return confirm('Wirklich löschen?')\" style='width:25px;height=15px; border: 0px solid;$set_style' name='$function' value='$b_name' title='$title'><img src='$varenv{metahost}/glyphicons/$b_img' style='height:18px;' /></button>";
$button = "<button type='submit' onClick=\"javascript:$jscript; return confirm('Wirklich löschen?')\" style='width:25px;height=15px; border: 0px solid;$set_style' name='$function' value='$b_name' title='$title'></button>";
}else{
$button = "<button type='submit' onClick=\"return confirm('Wirklich löschen?')\" style='width:25px;height=15px; border: 0px solid;$set_style' name='$function' value='$b_name' title='$title'><img src='$varenv{metahost}/glyphicons/$b_img' style='height:18px;' /></button>";
$button = "<button type='submit' onClick=\"return confirm('Wirklich löschen?')\" style='width:25px;height=15px; border: 0px solid;$set_style' name='$function' value='$b_name' title='$title'></button>";
}
}else{
$button = "<button type='submit' style='width:25px;height=15px; border: 0px solid;$set_style' name='$function' value='$b_name' title='$title' accesskey='$a_key'><img src='$varenv{metahost}/glyphicons/$b_img' style='height:18px;' /></button>";
$button = "<button type='submit' style='width:25px;height=15px; border: 0px solid;$set_style' name='$function' value='$b_name' title='$title' accesskey='$a_key'></button>";
}
}
return $button;
}
#with onclick
sub singlesubmit4(){
my $self = shift;
my ($function,$b_name,$title,$jscript,$url) = @_;
my $b_img;
$b_img = "search.png";# if("$title" =~ /suchen/);
my $button = "<input type='image' src='/img/$b_img' class='ebutton2' name='$function' value='$b_name' onClick='javascript:$jscript()' title='$title'>";
return $button;
}
#with onclick
sub singlesubmit5(){
my $self = shift;
my ($function,$b_name,$jscript,$url) = @_;
my ($key,$val,$ibv);
while (($key,$val) = each(%ib)) {
$ibv = $val if($b_name eq $key);
}
my $button = "<input type='submit' class='ebutton' name='$function' value='$ibv' onClick='javascript:$jscript(this.form,\"$url\")'>";
return $button;
}
#with onclick script
sub singlesubmit9(){
my $self = shift;
my ($function,$b_name,$main_id,$class,$style,$owner) = @_;
my $debug = $main_id if($owner && $owner eq $varenv{superu_id});
my $button = "<input type='button' class='$class' style='$style' name='$function' value='$b_name' title='$debug' onclick='javascript:history.back()'>\n";
return $button;
}
sub singlesubmit8(){
my $self = shift;
my ($function,$b_name,$jscript,$url) = @_;
my $button = "<button type='submit' onClick='javascript:$jscript' class='ebutton' name='$function' value='$b_name'>$b_name</button>";
return $button;
}
1;

12
copri4/main/src/Mod/Indexsharee.pm
View file

@ -724,7 +724,6 @@ sub handler {
my $url = "$varenv{wwwhost}/$path";
#my $onload="onLoad();";
my $onload="";
my $local_style = "$varenv{metahost}/$dbt->{shareeapp_conf}->{local_style}";
@ -734,21 +733,12 @@ sub handler {
my $js_bootstrap = "$varenv{metahost}/$dbt->{shareeapp_conf}->{js_bootstrap}";
my $style_bootstrap = "$varenv{metahost}/$dbt->{shareeapp_conf}->{style_bootstrap}";
my $style_bootstrap_icons = "$varenv{metahost}/$dbt->{copri_conf}->{style_bootstrap_icons}";
my $jquery_resize = "";
#2022-03-30 global set bootstrap with bayern standalone
#if($varenv{syshost} eq "shareeweb-bayern"){
# $js_bootstrap = "$varenv{metahost}/js/bootstrap-5.1.3-dist/js/bootstrap.min.js";
# $style_bootstrap = "$varenv{metahost}/js/bootstrap-5.1.3-dist/css/bootstrap.css";
#}else{
# $jquery = "$varenv{metahost}/js/jquery-1.9.1.js";#bootstrap 3 needs jquery
#}
if($varenv{wwwhost} =~ /shareedms/){
$local_style = "$varenv{metahost}/$dbt->{shareedms_conf}->{local_style}";
$jquery = "$varenv{metahost}/$dbt->{shareedms_conf}->{jquery}";
$jquery_ui = "$varenv{metahost}/$dbt->{shareedms_conf}->{jquery_ui}";
$style_jquery_ui = "$varenv{metahost}/$dbt->{shareedms_conf}->{style_jquery_ui}";
$jquery_resize = "$varenv{metahost}/$dbt->{shareedms_conf}->{jquery_resize}";
$js_bootstrap = "$varenv{metahost}/$dbt->{shareedms_conf}->{js_bootstrap}";
$style_bootstrap = "$varenv{metahost}/$dbt->{shareedms_conf}->{style_bootstrap}";
$dyn_js = "\$(function() {
@ -797,8 +787,6 @@ sub handler {
-src=>"$jquery"},
{-language=>'JAVASCRIPT',
-src=>"$jquery_ui"},
{-language=>'JAVASCRIPT',
-src=>"$jquery_resize"},
{-language=>'JAVASCRIPT',
-src=>"$varenv{metahost}/$dbt->{copri_conf}->{jsscript}"},
{-language=>'JAVASCRIPT',

10
copri4/main/src/Mod/Modalbox.pm
View file

@ -38,18 +38,10 @@ sub mobox(){
my $lang = "de";
my $dbh = "";
#TODO do it BrowserTab save
#my $kind_of_trans = $R::kind_of_trans || $users->{kind_of_trans} || "";
#my $c_id4trans = $R::c_id4trans || $users->{c_id4trans} || "";
#my $tpl_id4trans = $R::tpl_id4trans || $users->{tpl_id4trans} || "";
#my $kind_of_trans = $users_dms->{kind_of_trans} || "";
#my $c_id4trans = $users_dms->{c_id4trans} || "";
#my $tpl_id4trans = $users_dms->{tpl_id4trans} || "";
if($users_dms->{kind_of_trans} && looks_like_number($users_dms->{c_id4trans}) && looks_like_number($users_dms->{tpl_id4trans})){
my $width = $node_meta->{tpl_width} || "990";
my $bg_color = "white";
my $bg_color2 = $varenv{term_active_color} || "";
my $bg_color2 = "#f7ae37" || "";
my $table = "contenttrans";
my $ctt = $db->get_content1($table,$users_dms->{c_id4trans});

4
copri4/main/src/Mod/Prelib.pm
View file

@ -296,8 +296,8 @@ sub save_contenttranspos {
}
}elsif($R::int02 && $R::int03){
$R::int02 =~ s/\./\,/ if($R::int02 =~ /\,/);
$R::int03 =~ s/\./\,/ if($R::int03 =~ /\,/);
$R::int02 =~ s/,/\./ if($R::int02 =~ /\,/);
$R::int03 =~ s/,/\./ if($R::int03 =~ /\,/);
$R::txt01 = $q->escapeHTML($R::txt01) if($R::txt01);
$R::txt23 = $q->escapeHTML($R::txt23) if($R::txt23);
if($c_id && looks_like_number($R::int02) && looks_like_number($R::int03)){

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

@ -403,11 +403,10 @@ sub tpl(){
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/){
if($users_dms_primary->{u_id} && $dbt->{copri_conf}->{contributors} && $users_dms_primary->{u_id} =~ /$dbt->{copri_conf}->{contributors}/){
$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; end-ack $cttpos->{$pid}->{int27}" if($cttpos->{$pid}->{int27});
$user_device .= " &rarr; end-ack" 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);
@ -443,7 +442,7 @@ sub tpl(){
$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"}));
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", -style=>'font-size:1.6em;'}));
$bikenr = $q->a({-class=>"linknav3",-style=>"$stamm_style",-href=>"/DMS/Waren/?detail_search=1&s_barcode=$cttpos->{$pid}->{barcode}",-title=>"Rad im Warenstamm"},"$bikenr") if($cttpos->{$pid}->{cc_id});
if($node_meta->{ct_table} eq "contenttranspos"){
@ -467,7 +466,7 @@ sub tpl(){
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 $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 &rarr; $u_name/$u_name_end<br />$track_info $charge $comment_view"),"\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 /><span style='padding-left:60px;'>$charge $track_info $comment_view</span>"),"\n";
}
if($users_dms_primary->{u_id} && $users_dms->{u_id} && $users_dms->{int03} >= 1){

14
copri4/main/src/Tpl/Liste3.pm
View file

@ -806,7 +806,7 @@ sub tpl(){
#permissions
if($users_dms_primary->{int03} == 2 && $users_dms->{int03} == 2){
my $checked = 0;
$checked = 1 if($R::accounting_select && $node_meta->{template_id} == 209 && $ct4rel->{$id}->{int01} > 0 && $ct4rel->{$id}->{state} =~ /payone/i && !$ct4rel->{$id}->{int14});
$checked = 1 if($R::accounting_select && $node_meta->{template_id} == 209 && $ct4rel->{$id}->{int01} > 0 && $ct4rel->{$id}->{state} =~ /payone/i && !$ct4rel->{$id}->{int14} && !$ct4rel->{$id}->{txt22} && $ct4rel->{$id}->{int18} eq "1");
print $q->td({-style=>"background-color:silver;"}, $q->checkbox(-name=>"ck4ex", -checked=>"$checked", -value=>"$ct4rel->{$id}->{c_id}", -label=>'')),"\n";
}else{
print $q->td({-style=>"background-color:silver;"},"&nbsp;"),"\n";
@ -819,7 +819,7 @@ sub tpl(){
#fee2pos
if($table eq "content" && ($ct4rel->{$id}->{template_id} =~ /229/) && $R::ca_id && $R::ct_id){
print $q->a({-class=>"editnav",-href=>"/$dbt->{shareedms_conf}->{parent_node}/Mietjournal?insert_contenttranspos=1\&cc_id=$ct4rel->{$id}->{c_id}\&ca_id=$R::ca_id\&ct_id=$R::ct_id\&owner=$users_dms->{u_id}",-title=>"Gebühr hinzufügen"}, $q->img({-src=>"$varenv{metahost}/glyphicons/glyphicons-512-copy.png", -style=>'height:1.3em;'}));
print $q->a({-class=>"editnav",-href=>"/$dbt->{shareedms_conf}->{parent_node}/Mietjournal?insert_contenttranspos=1\&cc_id=$ct4rel->{$id}->{c_id}\&ca_id=$R::ca_id\&ct_id=$R::ct_id\&owner=$users_dms->{u_id}",-title=>"Gebühr hinzufügen"}, $q->span({-class=>"bi bi-clipboard2-plus", -style=>'font-size:1.5em;'}));
}
if($table eq "content" && ($ct4rel->{$id}->{template_id} =~ /205|225/)){
@ -833,7 +833,7 @@ sub tpl(){
}
my $search_key = "s_barcode=$ct4rel->{$id}->{barcode}";#bike
$search_key = "s_int04=$ct4rel->{$id}->{int04}" if($ct4rel->{$id}->{template_id} == 225);#station
print $q->a({-class=>"editnav",-href=>"$path/$node_names?detail_search=1\&$search_key",-title=>"zur Liste der Rad $ct4rel->{$id}->{barcode} Servicearbeiten"}, $q->img({-src=>"$varenv{metahost}/glyphicons/glyphicons-440-wrench.png", -style=>'height:1em;'}));
print $q->a({-class=>"editnav",-href=>"$path/$node_names?detail_search=1\&$search_key",-title=>"zur Liste der Rad $ct4rel->{$id}->{barcode} Servicearbeiten"}, $q->span({-class=>"bi bi-wrench"}));
}
##
print "</td>\n";
@ -926,7 +926,7 @@ sub tpl(){
$pos_details .= $did . " = " . $teaser . "</br>" if($pos_hash->{$did});
}
my $pos_id = "$ct4rel->{$id}->{c_id}";
if($users_dms->{u_id} && $users_dms->{u_id} =~ /1842|5781|11765|21618|38883/){
if($users_dms_primary->{u_id} && $dbt->{copri_conf}->{contributors} && $users_dms_primary->{u_id} =~ /$dbt->{copri_conf}->{contributors}/){
$pos_id = $q->div({-class=>"popup",-onclick=>"toggle_box('$id')"},"$ct4rel->{$id}->{c_id}", $q->span({-class=>"popuptext",-id=>"$id"},"$pos_details"));
}
print $q->td({-class=>'tdtxt',-style=>"font-weight:normal;$set_style4nr"},"$pos_id"),"\n";
@ -1029,7 +1029,7 @@ sub tpl(){
$txt01 = "<b>$txt01</b>" if($ct4rel->{$id}->{state} eq "Kassenbestand");
print $q->td({-class=>'tdtxt',-style=>"$txtstyle $set_style"},"$txt01"),"\n";
}elsif($key =~ /txt03/ && $ct4rel->{$id}->{template_id} eq "227"){
print $q->td({-class=>'tdtxt',-style=>"$txtstyle $set_style"},$q->a({-style=>"color:black;",-href=>"$varenv{metahost}/site/$ct4rel->{$id}->{$key}", -target=>'_blank',-title=>'download',-type=>'application/octet-stream'}, $q->img({-src=>"$varenv{metahost}/glyphicons/file-any.png", -style=>'height:1.3em;'}),"$ct4rel->{$id}->{$key}")),"\n";
print $q->td({-class=>'tdtxt',-style=>"$txtstyle $set_style"},$q->a({-style=>"color:black;",-href=>"$varenv{metahost}/site/$ct4rel->{$id}->{$key}", -target=>'_blank',-title=>'anzeigen'},"$ct4rel->{$id}->{$key}")),"\n";
}elsif($key =~ /txt00/ && $v_journal){
print $q->td({-class=>'tdtxt',-style=>"$txtstyle $set_style"},"$ct4rel->{$id}->{$key}"),"\n";
}elsif($key =~ /txt08/ && $table eq "contentadr"){
@ -1216,7 +1216,7 @@ sub tpl(){
my @pdfs = $lb->read_dirfiles("$opdir_dms/ftp/SWK_codes","got_last\.csv","file","");
foreach(@pdfs){
print $q->Tr(),"\n";
print $q->td({-class=>"tdtxt",-colspan=>10},"SWK Bonunsnummern download ",$q->a({-class=>'linknav3',-href=>"$varenv{wwwhost}/FileOut?file=$_&sessionid=$coo", -target=>'_default', -title=>'Download',-type=>'application/octet-stream'}, $q->img({-src=>"$varenv{metahost}/glyphicons/file-any.png", -style=>'width:25px;'}), "\"$_\"")),"\n";
print $q->td({-class=>"tdtxt",-colspan=>10},"SWK Bonunsnummern download ",$q->a({-class=>'linknav3',-href=>"$varenv{wwwhost}/FileOut?file=$_&sessionid=$coo", -target=>'_default', -title=>'Download',-type=>'application/octet-stream'}, $q->span({-class=>"bi bi-download"}), "\"$_\"")),"\n";
}
}
}
@ -1243,7 +1243,7 @@ sub tpl(){
}elsif($table eq "contenttrans"){
print $q->div({-style=>'padding:0 20px;font-style:italic;'}, $q->span({-style=>'padding:0.1em 0.8em;',-style=>'color:red;'},"&bull;"), "payone error"),"\n";
}elsif($table eq "content" && $node_meta->{tpl_id} =~ /205|225/){
print $q->div({-style=>'padding:0 20px;font-style:italic;'}, $q->span({-style=>'padding:0.1em 0.8em;'},$q->img({-src=>"$varenv{metahost}/glyphicons/glyphicons-440-wrench.png", -style=>'height:1.3em;'})), "Service-Wartung"),"\n";
print $q->div({-style=>'padding:0 20px;font-style:italic;'}, $q->span({-class=>"bi bi-wrench"}), "Service-Wartung"),"\n";
}
print $q->div({-style=>'padding:0.5em;'}, "&nbsp;"),"\n";

2
copri4/main/src/Tpl/MandantConf.pm
View file

@ -91,7 +91,7 @@ sub tpl(){
print "</td>\n";
}else{
print "<td class='ct_editline'>";
print $q->a({-class=>"editnav",-href=>"$script$path?config2edit=1",-title=>'bearbeiten'}, $q->img({-src=>"$varenv{metahost}/glyphicons/glyphicons-151-edit.png"}));
print $q->a({-class=>"editnav",-href=>"$script$path?config2edit=1",-title=>'bearbeiten'}, $q->span({-class=>"bi bi-file-earmark-text-fill", -style=>'font-size:1.5em;'}));
print "</td>\n";
}
print $q->td({-style=>"background-color:white;padding-right:10px;border-bottom: 1px solid silver;text-align:right;font-size:12px;"}, "$u_name / $ct->{mtime}");

12
copri4/main/src/Tpl/SubListe.pm
View file

@ -59,14 +59,13 @@ sub tpl(){
my $message = "";
my $s_owner_id = "";
my $scol = "mtime";
my $offset = $R::offset || "0";
$offset = 0 if($node_meta->{int10} && $node_meta->{int10} < $varenv{limit});
my $limit = $R::limit || $varenv{limit};
my $searchref = {
time => $time,
scol => $scol,
scol => "mtime",
offset => $offset,
limit => $limit,
export => "",
@ -197,7 +196,7 @@ EOF
$db->users_up("col_sort","0",$users_dms->{owner}) if($searchref->{scol} ne $users_dms->{col_sort});
}
$searchref->{scol} = "change" if($node_meta->{template_id} == 198);
$searchref->{scol} = "u_id" if($node_meta->{template_id} == 198);
$users_dms->{sort_updown} = "down" if(!$users_dms->{sort_updown});
#print Dumper($node_meta);
@ -353,7 +352,7 @@ EOF
if($key eq "pdf01"){
foreach(@pdfs){
print $q->Tr(),"\n";
print $q->td({-class=>"$tdclass"},$q->a({-class=>'linknav3',-href=>"$varenv{wwwhost}/FileOut?file=$_&sessionid=$coo", -target=>'_default', -title=>'Download',-type=>'application/octet-stream'}, $q->img({-src=>"$varenv{metahost}/glyphicons/file-any.png", -style=>'width:25px;'}), "$_")),"\n";
print $q->td({-class=>"$tdclass"},$q->a({-class=>'linknav3',-href=>"$varenv{wwwhost}/FileOut?file=$_&sessionid=$coo", -target=>'_default', -title=>'Download',-type=>'application/octet-stream'},$q->span({-class=>"bi bi-download", -style=>'font-size:1.2em;'}), "$_")),"\n";
}
}
}
@ -361,15 +360,16 @@ EOF
}
#BIG LOOP loop content table
else{
my $scol = $searchref->{scol};
foreach my $id (sort {
if($users_dms->{sort_updown} eq "down"){
if ($scol =~ /barcode|int/) {
if ($scol =~ /barcode|int|_id/) {
$ct4rel->{$b}->{$scol} <=> $ct4rel->{$a}->{$scol}
}else{
$ct4rel->{$b}->{$scol} cmp $ct4rel->{$a}->{$scol}
}
}else{
if ($scol =~ /barcode|int/) {
if ($scol =~ /barcode|int|_id/) {
$ct4rel->{$a}->{$scol} <=> $ct4rel->{$b}->{$scol}
}else{
$ct4rel->{$a}->{$scol} cmp $ct4rel->{$b}->{$scol}

20
copri4/main/src/Tpl/TransPositionen.pm
View file

@ -222,13 +222,13 @@ EOF
print $q->hidden(-name=>'cc_id', -value=>"$cttpos->{$id}->{cc_id}", -override=>'1'),"\n";
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$ctt->{content_id}"),"\n";
print $q->hidden(-name=>'tpl_id4trans', -override=>'1', -value=>"$ctt->{template_id}"),"\n";
print $but->singlesubmit2("ct_trans","save_pos","$ib{save_pos}","background-color:white;padding:20px;","")," ",
$but->singlesubmit2("ct_trans","delete_pos","$ib{delete_pos}","background-color:white;padding:20px;",""),"\n";
print $but->singlesubmit2glyph("ct_trans","save_pos","$ib{save_pos}","background-color:white;padding:5px 5px 0 0;","")," ",
$but->singlesubmit2glyph("ct_trans","delete_pos","$ib{delete_pos}","background-color:white;padding:5px 0 0 5px;",""),"\n";
}elsif(!$ctt->{close_time}){
print $q->a({-class=>"editnav",-href=>"/DMS/Faktura?trans2edit=transpos\&c_idpos=$cttpos->{$id}->{c_id}\&c_id4trans=$ctt->{content_id}\&tpl_id4trans=$ctt->{template_id}\&owner=$users_dms->{u_id}",-title=>"Datensatz bearbeiten"}, $q->img({-src=>"$varenv{metahost}/glyphicons/glyphicons-151-edit.png"})),"\n";
print $q->a({-class=>"editnav3",-href=>"/DMS/Faktura?trans2edit=transpos\&c_idpos=$cttpos->{$id}->{c_id}\&c_id4trans=$ctt->{content_id}\&tpl_id4trans=$ctt->{template_id}\&owner=$users_dms->{u_id}",-title=>"Datensatz bearbeiten"}, $q->span({-class=>"bi bi-file-earmark-text", -style=>'font-size:1.7em;'})),"\n";
}
my $calpath = "Mietjournal";
print $q->a({-class=>"linknav3", -style=>"background-color:$varenv{calendar_active_color}",-href=>"/DMS/$calpath/?cttpos_id=$cttpos->{$id}->{c_id}",-title=>"Im $calpath öffnen"},"<br /><br />ID $cttpos->{$id}->{c_id}"),"\n";
print $q->a({-class=>"linknav3",-href=>"/DMS/$calpath/?cttpos_id=$cttpos->{$id}->{c_id}",-title=>"Im $calpath anzeigen"},"<br /><br />&rarr; ID $cttpos->{$id}->{c_id}"),"\n";
print "</td>\n";
#Tablecontent (parameter)
@ -292,14 +292,12 @@ EOF
my ($s_yy,$s_mo,$s_dd,$s_hh,$s_mi) = $lb->split_date($cttpos->{$id}->{start_time});
my ($e_yy,$e_mo,$e_dd,$e_hh,$e_mi) = $lb->split_date($cttpos->{$id}->{end_time});
print "<td class='element' style='$txtstyle $set_style;background-color: #ededed;$occupied_style;'>\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),"<br />\n";
print "<td class='tdtxt3' style='$txtstyle $set_style;$occupied_style;'>\n";
print $q->textarea(-class=>'autos',-style=>"border: 1px solid #ededed;",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-rows=>"3",-cols=>60, -autofocus=>1),"<br />\n";
#if Traiff Nr.
if($cttpos->{$id}->{int09}){
print $q->span({-style=>"$txtstyle $set_style"},
"Tarif Nr.: ", $q->textfield(-class=>'etxt',-name=>"int09",-default=>"$cttpos->{$id}->{int09}",-size=>"5",-maxlength=>5),
"Tarif Text", $q->textfield(-class=>'etxt',-name=>"txt04",-default=>"$cttpos->{$id}->{txt04}",-size=>"30",-maxlength=>50)),"<br />\n";
print $q->span({-style=>"$txtstyle $set_style"}, "Tarif: $cttpos->{$id}->{int09} $cttpos->{$id}->{txt04}<br />"), "\n";
print $q->span({-style=>"$txtstyle $set_style"},
"Endstation: ", $q->textfield(-class=>'etxt',-name=>"int04",-default=>"$cttpos->{$id}->{int04}",-size=>"5",-maxlength=>40),
@ -314,6 +312,7 @@ EOF
$q->textfield(-class=>'etxt',-name=>"e_mi",-default=>"$e_mi",-size=>"1",-maxlength=>2)),"\n";
}
print "<br /><b>Interner Kommentar:</b> $cttpos->{$id}->{txt23}\n" if($cttpos->{$id}->{txt23});
print "</td>\n";
}elsif($key =~ /txt/){
print $q->td({-class=>'element',-style=>"$txtstyle $set_style"},$q->textfield(-class=>'etxt',-style=>"$txtstyle",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-size=>"$isize",-maxlength=>100)),"\n";
@ -381,7 +380,7 @@ EOF
}elsif($key =~ /txt01/){
$cttpos->{$id}->{$key} = $q->unescapeHTML("$cttpos->{$id}->{$key}");
$cttpos->{$id}->{$key} = $lb->newline($cttpos->{$id}->{$key},"","");
print "<td class='tdtxt', style='$occupied_style;'>\n";
print "<td class='tdtxt3', style='$occupied_style;'>\n";
if($cttpos->{$id}->{barcode} && $cttpos->{$id}->{int09}){#bike with tariff-nr
my $u_name = $cttpos->{$id}->{owner};
my $u_name_end = $cttpos->{$id}->{owner_end};
@ -431,6 +430,7 @@ EOF
print "<br />\n";
print $q->span({-style=>"$time_style"}, "Mietzeit: $start_time &rarr; $end_time"),"\n";
}
print "<br /><b>Interner Kommentar:</b> $cttpos->{$id}->{txt23}\n" if($cttpos->{$id}->{txt23});
print "</td>\n";
}elsif($key =~ /txt/){
print $q->td({-class=>'tdtxt'},"$cttpos->{$id}->{$key}"),"\n";

1
copri4/main/src/scripts/auerswald_gespr.pl Symbolic link
View file

@ -0,0 +1 @@
../../../../../sharee.bike/copri-bike/main/src/scripts/auerswald_gespr.pl

1
copri4/shareeapp-operator/glyphicons
View file

@ -1 +0,0 @@
../main/glyphicons

5
copri4/shareeconf/examples/global.cfg
View file

@ -253,14 +253,11 @@
payment_state = "SEPA-Lastschrift (payone)|Kreditkarte (payone)|Überweisung|Gutschrift"
order_state = "|angerufen|eMail gesendet|in Arbeit|cronjob fail"
warning_state = "|1. Mahnung|2. Mahnung|3. Mahnung|4. Mahnung|5. Mahnung"
term_active_color = "f7ae37"
local_style = "css/local_style20221106.css"
local_style = "css/local_style20221205.css"
jquery = "js/jquery-3.3.1.min.js"
jquery_ui = "js/jquery-ui-1.12.1/jquery-ui.min.js"
style_jquery_ui = "js/jquery-ui-1.12.1/jquery-ui.min.css"
jquery_resize = "js/jquery.autosize.js"
js_bootstrap = "js/bootstrap-5.0.2-dist/js/bootstrap.min.js"
style_bootstrap = "js/bootstrap-5.0.2-dist/css/bootstrap.min.css"
mod_active = "Waren|Faktur|Karte|Kunden|Mietjournal|Alarmjournal|Einstellung"

1
copri4/shareedms-operator/glyphicons
View file

@ -1 +0,0 @@
../main/glyphicons

5
copri4/shareedms-operator/src/Lib/Mlogic.pm
View file

@ -88,7 +88,7 @@ sub tpl(){
$offset += $limit;
}
my $ctrel = $db->get_ctrel($table,"",$lang,"",$users_dms->{c_id4trans},$users_dms->{tpl_id4trans});
print $q->div({-id=>'Headerlogin',-style=>"background-color:$varenv->{term_active_color};"},$q->a({-class=>'elinkbutton1',-title=>"Faktura Terminal öffnen",-href=>"$varenv->{wwwhost}/DMS/Faktura?ct_trans=open\&c_id4trans=$users_dms->{c_id4trans}\&tpl_id4trans=$users_dms->{tpl_id4trans}\&owner=$users_dms->{owner}\&offset=$offset\&limit=$limit\&relids=$R::relids\&no_redirect=1"}," Faktura \#$ctrel->{ct_name} $ctrel->{txt01}", $q->span({-id=>"c_id4trans", -style=>"color:$varenv->{term_active_color}"}, "$users_dms->{c_id4trans}"))) if($ctrel->{ct_name});
print $q->div({-id=>'Headerlogin',-style=>"background-color:#f7ae37;"},$q->a({-class=>'elinkbutton1',-title=>"Faktura Terminal öffnen",-href=>"$varenv->{wwwhost}/DMS/Faktura?ct_trans=open\&c_id4trans=$users_dms->{c_id4trans}\&tpl_id4trans=$users_dms->{tpl_id4trans}\&owner=$users_dms->{owner}\&offset=$offset\&limit=$limit\&relids=$R::relids\&no_redirect=1"}," Faktura \#$ctrel->{ct_name} $ctrel->{txt01}", $q->span({-id=>"c_id4trans", -style=>"color:#f7ae37"}, "$users_dms->{c_id4trans}"))) if($ctrel->{ct_name});
}
print $q->div({-id=>'Headerlogin'},"$users_sharee->{txt08} ", $q->span({-id=>"owner", -style=>"color:silver"}, "($users_dms->{u_id})")),"\n";
@ -153,6 +153,9 @@ sub tpl(){
if($users_dms_primary->{u_id} && $users_dms_primary->{int03} >= 1 && $users_dms->{u_id} && $users_dms->{int03} >= 1){
$mod_active .= "|Faktura";
}
if($users_dms->{u_id} && $users_dms->{int01} >= 2 && ($users_dms->{int07} >= 1 || $users_dms->{int08} >= 1)){
$mod_active .= "|Einstellung";#trust only if parts editable
}
###Top Menu
#bootstrap menue

1
copri4/shareeweb-project/glyphicons
View file

@ -1 +0,0 @@
../main/glyphicons