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

copri feedback-dialog and new-content fix

Browse source
This commit is contained in:
ragu 2023-09-05 09:12:06 +02:00
parent a285cc0d02
commit 4734370702
8 changed files with 37 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1494,28 +1494,6 @@ sub booking_update(){
$booking_values->{co2saving} = $co2saving; $booking_values->{co2saving} = $co2saving;
} }
} }
#to LV only if available
if($varenv{dbname} eq "sharee_lv" && $booking->{int10} == 1){
#system(`$varenv{basedir}/src/scripts/xml2lastenvelo.pl pos2xml $booking->{c_id} "contenttranspos" ""`);
my $xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
$xml .= "<sharee_LastenVelo>\n";
$xml .= "<todo>available</todo>\n";
$xml .= "<bikeID>$booking_values->{bike}</bikeID>\n";
$xml .= "<userID>$auth->{int01}</userID>\n";
$xml .= "<emailID>$auth->{txt08}</emailID>\n";
$xml .= "</sharee_LastenVelo>\n";
my $avail_file = "$varenv{xmlfile}/sharee_available.xml";
unlink "$avail_file";
open(FILE,">$avail_file");
print FILE "$xml";
close(FILE);
chmod 0666, "$avail_file";
$bw->log("scp $avail_file",$xml,"");
system("/usr/bin/scp -P 50001 $avail_file pi\@localhost:/home/pi/lvfserver/inbox_xml_files/.") if($dbt->{copri_conf}->{stage} eq "live");
}
} }
} }
return ($rows,$booking_values); return ($rows,$booking_values);

19
copri4/main/src/Mod/APIjsonserver.pm
View file

@ -120,7 +120,12 @@ if(!$coo && !$q->param('merchant_id')){
#if($aowner && ($aowner == 195 || $aowner == 185 || $aowner == 176)){ #if($aowner && ($aowner == 195 || $aowner == 185 || $aowner == 176)){
if($return_merchant->{project_id} eq "Konstanz"){ if($return_merchant->{project_id} eq "Konstanz"){
$response->{agb_html} = "$dbt->{project_conf}->{Konstanz}->{agb_html}"; $response->{agb_html} = "$dbt->{project_conf}->{Konstanz}->{agb_html}";
$response->{tariff_info_html} = "$dbt->{project_conf}->{Konstanz}->{tariff_info_html}";
$response->{bike_info_html} = "$dbt->{project_conf}->{Konstanz}->{bike_info_html}"; $response->{bike_info_html} = "$dbt->{project_conf}->{Konstanz}->{bike_info_html}";
if($lang ne "de"){
$response->{tariff_info_html} =~ s/\.html/_en\.html/;
$response->{bike_info_html} =~ s/\.html/_en\.html/;
}
} }
if($return_merchant->{project_id} eq "Bayern"){ if($return_merchant->{project_id} eq "Bayern"){
$response->{agb_html} = "$dbt->{project_conf}->{Bayern}->{agb_html}"; $response->{agb_html} = "$dbt->{project_conf}->{Bayern}->{agb_html}";
@ -717,16 +722,16 @@ elsif($q->param('request') eq "stations_available"){
} }
#App merchant message #App merchant message
if($user_agent =~ /konrad/i){ if($user_agent =~ /konrad/i && $varenv{cms}->{'App-merchant-message'}->{txt}){
if($epoch_now >= $epoch_start && $epoch_now <= $epoch_end){ #if($epoch_now >= $epoch_start && $epoch_now <= $epoch_end){
$response->{merchant_message} = $varenv{cms}->{'App-merchant-message'}->{txt}; $response->{merchant_message} = $varenv{cms}->{'App-merchant-message'}->{txt};
} #}
} }
#disabled sig is offline message #App merchant message bayern
if(1==2 && $user_agent =~ /bayern/i){ if($user_agent =~ /bayern/i && $varenv{cms}->{'App-merchant-message-bayern'}->{txt}){
if($epoch_now >= $epoch_start && $epoch_now <= $epoch_end){ #if($epoch_now >= $epoch_start && $epoch_now <= $epoch_end){
$response->{merchant_message} = $varenv{cms}->{'App-merchant-message-bayern'}->{txt}; $response->{merchant_message} = $varenv{cms}->{'App-merchant-message-bayern'}->{txt};
} #}
} }
$response = { %$response, %$auth }; $response = { %$response, %$auth };

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

@ -78,9 +78,9 @@ EOF
if($feedb->{message} && $feedb->{message} =~ /[a-z]/ && $feedb->{message} !~ /failure::/){ if($feedb->{message} && $feedb->{message} =~ /[a-z]/ && $feedb->{message} !~ /failure::/){
print $q->div({-id=>'retm'},"$feedb->{message} $debug"),"\n"; print $q->div({-id=>'retm'},"$feedb->{message} $debug"),"\n";
}else{ }else{
print $q->div({-id=>'retm'},"$node_meta->{node_name} angelegt $debug"),"\n" if($feedb->{i_rows}); print $q->div({-id=>'retm'},"Datensatz in \"$node_meta->{node_name}\" angelegt $debug"),"\n" if($feedb->{i_rows});
print $q->div({-id=>'retm'},"$node_meta->{node_name} aktualisiert $debug"),"\n" if($feedb->{u_rows}); print $q->div({-id=>'retm'},"Datensatz in \"$node_meta->{node_name}\" aktualisiert $debug"),"\n" if($feedb->{u_rows});
print $q->div({-id=>'retm'},"$node_meta->{node_name} gelöscht $debug"),"\n" if($feedb->{d_rows}); print $q->div({-id=>'retm'},"Datensatz in \"$node_meta->{node_name}\" gelöscht $debug"),"\n" if($feedb->{d_rows});
} }
} }

8
copri4/main/src/Mod/Modalbox3.pm
View file

@ -23,9 +23,7 @@ sub new {
sub mobox3(){ sub mobox3(){
my $node_meta = shift; my $node_meta = shift;
my $users_dms = shift; my $users_dms = shift;
my $feedb = shift || ""; my $feedb = shift || {};
my $return = shift || "";
my $mode = shift || "";
my $q = new CGI; my $q = new CGI;
my $cf = new Config; my $cf = new Config;
@ -102,10 +100,10 @@ EOF
if($R::node2edit && $R::node2edit =~ /new_relation|edit_relation/){ if($R::node2edit && $R::node2edit =~ /new_relation|edit_relation/){
if($node_meta->{ct_table} eq "content" && $node_meta->{template_id} eq "205"){ if($node_meta->{ct_table} eq "content" && $node_meta->{template_id} eq "205"){
require "Mod/NodeEdit.pm"; require "Mod/NodeEdit.pm";
&NodeEdit::admin_tpl($node_meta,$users_dms,$mode,$return); &NodeEdit::admin_tpl($node_meta,$users_dms);
}elsif($users_dms->{u_id} == $dbt->{copri_conf}->{superu_id}){ }elsif($users_dms->{u_id} == $dbt->{copri_conf}->{superu_id}){
require "Mod/NodeEdit.pm"; require "Mod/NodeEdit.pm";
&NodeEdit::admin_tpl($node_meta,$users_dms,$mode,$return,"only superu_id"); &NodeEdit::admin_tpl($node_meta,$users_dms,"only superu_id");
}else{ }else{
print $q->div("Dieses Menue ist zur Bearbeitung nicht freigegeben."); print $q->div("Dieses Menue ist zur Bearbeitung nicht freigegeben.");
} }

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

@ -26,8 +26,6 @@ sub new {
sub admin_tpl(){ sub admin_tpl(){
my $node_meta = shift; my $node_meta = shift;
my $users_dms = shift; my $users_dms = shift;
my $u_group = shift;
my $return = shift;
my $superu_id = shift || ""; my $superu_id = shift || "";
my $q = new CGI; my $q = new CGI;

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

@ -436,7 +436,7 @@ EOF
} }
#it will takes only one dataset #it will takes only one dataset
if($node_meta->{ct_table} eq "contenttrans" && $c_id4trans && $c_id4trans =~ /^\d+$/ && (($users_dms->{faksum}) || ($node_meta->{tpl_id} == 209 && $v_journal && !$R::detail_search))){ if($node_meta->{ct_table} eq "contenttrans" && $c_id4trans && $c_id4trans =~ /^\d+$/ && (($users_dms->{faksum}) || ($full_url ne $referer) || ($node_meta->{tpl_id} == 209 && $v_journal && !$R::detail_search))){
$ct4rel = $db->collect_cid($table,$lang,$tplids,$R::rel_id,$R::barcode,"c_id",$c_id4trans); $ct4rel = $db->collect_cid($table,$lang,$tplids,$R::rel_id,$R::barcode,"c_id",$c_id4trans);
}elsif(!$start_chck && !$end_chck){ }elsif(!$start_chck && !$end_chck){

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

@ -26,8 +26,7 @@ sub new {
sub tpl(){ sub tpl(){
my $node_meta = shift; my $node_meta = shift;
my $users_dms = shift; my $users_dms = shift;
my $u_group = shift; my $feedb = shift || {};
my $return = shift || "";
my $q = new CGI; my $q = new CGI;
my $cf = new Config; my $cf = new Config;
@ -63,7 +62,7 @@ sub tpl(){
$rel = $db->get_rel4tpl($node_meta->{main_id},$lang,"","197","","",">0"); $rel = $db->get_rel4tpl($node_meta->{main_id},$lang,"","197","","",">0");
$ct = $db->get_content1("contentuser",$rel->{content_id}); $ct = $db->get_content1("contentuser",$rel->{content_id});
}else{ }else{
$return = "failure::Abbruch. Keine Zugriffsberechtigung"; $feedb->{message} = "failure::Abbruch. Keine Zugriffsberechtigung";
} }
} }
@ -79,7 +78,7 @@ sub tpl(){
#Content #Content
print $q->start_table({-border=>'0', -width=>'100%',-align=>'center', -cellpadding=>'3', -cellspacing=>'0'}); print $q->start_table({-border=>'0', -width=>'100%',-align=>'center', -cellpadding=>'3', -cellspacing=>'0'});
if($return !~ /failure/){ if($feedb->{message} !~ /failure/){
print $q->Tr(); print $q->Tr();
if($R::config2edit){ if($R::config2edit){
print "<td class='ct_editline'>"; print "<td class='ct_editline'>";
@ -142,6 +141,6 @@ sub tpl(){
$debug = "(ct_table: $node_meta->{ct_table} | main_id: $node_meta->{main_id} | c_id: $ct->{c_id} | tpl_id: $tpl->{tpl_id} | rel_id: $rel->{rel_id})"; $debug = "(ct_table: $node_meta->{ct_table} | main_id: $node_meta->{main_id} | c_id: $ct->{c_id} | tpl_id: $tpl->{tpl_id} | rel_id: $rel->{rel_id})";
print $q->div({-style=>'z-index:10;font-size:13px;'},"$debug"),"\n" if($users_dms->{u_id} == $dbt->{copri_conf}->{superu_id}); print $q->div({-style=>'z-index:10;font-size:13px;'},"$debug"),"\n" if($users_dms->{u_id} == $dbt->{copri_conf}->{superu_id});
return $return; return $feedb;
} }
1; 1;

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

@ -302,9 +302,8 @@ sub tplselect(){
my $users_dms = shift; my $users_dms = shift;
my $mode = shift || ""; my $mode = shift || "";
my $varenv = shift; my $varenv = shift;
my $feedb = shift || ""; my $feedb_req = shift || {};
my $return = "";
my $sort = ""; my $sort = "";
my $lang = "de"; my $lang = "de";
my $tpl_name = $node_meta->{tpl_name}; my $tpl_name = $node_meta->{tpl_name};
@ -312,15 +311,14 @@ sub tplselect(){
my $ct_table = $node_meta->{ct_table}; my $ct_table = $node_meta->{ct_table};
my $parent_id = $node_meta->{parent_id}; my $parent_id = $node_meta->{parent_id};
my $main_id = $node_meta->{main_id}; my $main_id = $node_meta->{main_id};
#print Dumper($node_meta); my $feedb = { message => '' };
#exit;
if($node_meta->{tpl_id} =~ /194|195|199/ && $node_meta->{ct_table} eq "contentuser"){ if($node_meta->{tpl_id} =~ /194|195|199/ && $node_meta->{ct_table} eq "contentuser"){
require "Tpl/SubListe.pm"; require "Tpl/SubListe.pm";
$feedb = &SubListe::tpl($node_meta,$users_dms,$feedb); $feedb = &SubListe::tpl($node_meta,$users_dms,$feedb);
}elsif($node_meta->{ct_table} eq "contentuser"){ }elsif($node_meta->{ct_table} eq "contentuser"){
require "Tpl/MandantConf.pm"; require "Tpl/MandantConf.pm";
$return = &MandantConf::tpl($node_meta,$users_dms,$mode,$feedb); $feedb = &MandantConf::tpl($node_meta,$users_dms,$feedb);
}elsif($node_meta->{tpl_id} == 1 && $node_meta->{main_id} == 200017){ }elsif($node_meta->{tpl_id} == 1 && $node_meta->{main_id} == 200017){
require "Tpl/Karte_osm.pm"; require "Tpl/Karte_osm.pm";
&Karte_osm::tpl($node_meta,$users_dms,$mode,$varenv,"",$feedb); &Karte_osm::tpl($node_meta,$users_dms,$mode,$varenv,"",$feedb);
@ -334,24 +332,26 @@ sub tplselect(){
require "Tpl/Calorin.pm"; require "Tpl/Calorin.pm";
&Calorin::tpl($node_meta,$users_dms,$mode,$feedb); &Calorin::tpl($node_meta,$users_dms,$mode,$feedb);
} }
#print Dumper($feedb);
#exit;
if(ref($feedb) eq "HASH" && $feedb->{message} =~ /failure/){ if(ref($feedb_req) eq "HASH" && $feedb_req->{message} =~ /failure/){
require "Mod/Failure.pm"; require "Mod/Failure.pm";
&Failure::tpl($varenv,$users_dms->{u_id},$feedb); &Failure::tpl($varenv,$users_dms->{u_id},$feedb_req);
}elsif($return =~ /failure/){
$feedb->{message} = "$return";
require "Mod/Failure.pm";
&Failure::tpl($varenv,$users_dms->{u_id},$feedb);
}else{ }else{
if(($R::ct_trans !~ /close/) && ($ct_table =~ /contenttrans/) && ($R::ct_trans || $R::trans2edit || $R::ctpos_activ || $R::select_part || $R::set_main_id)){ if(($R::ct_trans !~ /close/) && ($ct_table =~ /contenttrans/) && ($R::ct_trans || $R::trans2edit || $R::ctpos_activ || $R::select_part || $R::set_main_id)){
&Modalbox::mobox($node_meta,$users_dms,$return); &Modalbox::mobox($node_meta,$users_dms,$feedb_req);
}elsif(($R::ct_trans !~ /close/) && ($ct_table =~ /content$|contentadr|contentuser|contentpos|users$|contenttranspos/ && ($R::ct_trans || $R::rel_edit || $R::base_edit)) || ($R::node2edit && $R::node2edit =~ /edit/)){ }elsif(($R::ct_trans !~ /close/) && ($ct_table =~ /content$|contentadr|contentuser|contentpos|users$|contenttranspos/ && ($R::ct_trans || $R::rel_edit || $R::base_edit)) || ($R::node2edit && $R::node2edit =~ /edit/)){
&Modalbox3::mobox3($node_meta,$users_dms,$feedb,$return,$mode) if($R::rel_edit !~ /delete|save/ && $R::ct_trans !~ /delete/ && $R::base_edit !~ /delete|save_pos/ && !$R::service_id); &Modalbox3::mobox3($node_meta,$users_dms,$feedb_req) if($R::rel_edit !~ /delete|save/ && $R::ct_trans !~ /delete/ && $R::base_edit !~ /delete|save_pos/ && !$R::service_id);
} }
} }
if(ref($feedb) eq "HASH" && $feedb->{message}){ #prio feedback on data request
if(ref($feedb_req) eq "HASH"){
$bw->return_feedback($node_meta,$users_dms,$feedb_req);
}elsif(ref($feedb) eq "HASH" && $feedb->{message}){
$bw->return_feedback($node_meta,$users_dms,$feedb); $bw->return_feedback($node_meta,$users_dms,$feedb);
} }
} }
1; 1;