From 28b568ed11fcf96b4d1e0e093837b1c4be89dd84 Mon Sep 17 00:00:00 2001
From: Milan <mc@radiopiloten.de>
Date: Sat, 3 Dec 2022 22:48:42 +0100
Subject: [PATCH] select-events: add button to confirm selection

---
 website/agenda/planung/js/select-event.js      |  4 ++--
 website/agenda/planung/pot/de/event.po         |  3 +++
 website/agenda/planung/pot/en/event.po         |  3 +++
 website/agenda/planung/select-event.cgi        | 10 ++++------
 .../agenda/planung/templates/edit-event.html   |  3 ++-
 .../agenda/planung/templates/edit-series.html  | 18 +++++++++---------
 website/agenda/planung/user-selected-event.cgi |  4 ++--
 7 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/website/agenda/planung/js/select-event.js b/website/agenda/planung/js/select-event.js
index 54d2d3c..388d7a7 100644
--- a/website/agenda/planung/js/select-event.js
+++ b/website/agenda/planung/js/select-event.js
@@ -109,8 +109,8 @@ function selectEventAction(resultElemId){
     url += "&selected_event="     + eventId;
     $.get(url).done(function() {
         console.log("success: "+url)
-    }).fail(function() {
-        console.log("failed: "+url)
+    }).fail(function(jqXHR, textStatus) {
+        console.log("failed: "+url, "status:" + textStatus)
     });
 
     console.log(`set: "${resultElemId}"="${eventId}"`)
diff --git a/website/agenda/planung/pot/de/event.po b/website/agenda/planung/pot/de/event.po
index ab41469..4b160fe 100644
--- a/website/agenda/planung/pot/de/event.po
+++ b/website/agenda/planung/pot/de/event.po
@@ -23,6 +23,9 @@ msgstr "Speichern"
 msgid "button_delete"
 msgstr "Löschen"
 
+msgid "button_apply"
+msgstr "Übernehmen"
+
 msgid "button_unassign_event"
 msgstr "aus Sendereihe entfernen"
 
diff --git a/website/agenda/planung/pot/en/event.po b/website/agenda/planung/pot/en/event.po
index 625bebb..05051ee 100644
--- a/website/agenda/planung/pot/en/event.po
+++ b/website/agenda/planung/pot/en/event.po
@@ -22,6 +22,9 @@ msgstr "save"
 msgid "button_delete"
 msgstr "delete"
 
+msgid "button_apply"
+msgstr "apply"
+
 msgid "button_unassign_event"
 msgstr "unassign from series"
 
diff --git a/website/agenda/planung/select-event.cgi b/website/agenda/planung/select-event.cgi
index e26d587..2ef481d 100755
--- a/website/agenda/planung/select-event.cgi
+++ b/website/agenda/planung/select-event.cgi
@@ -24,9 +24,8 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 my $config = config::get('../config/config.cgi');
-my $debug  = $config->{system}->{debug};
 my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
-return if ( ( !defined $user ) || ( $user eq '' ) );
+return if !defined $user or $user eq '';
 
 my $user_presets = uac::get_user_presets(
     $config,
@@ -40,6 +39,9 @@ $params->{default_studio_id} = $user_presets->{studio_id};
 $params = uac::setDefaultStudio( $params, $user_presets );
 $params = uac::setDefaultProject( $params, $user_presets );
 
+#process header
+print "Content-type:text/html; charset=UTF-8;\n\n";
+
 my $request = {
     url => $ENV{QUERY_STRING} || '',
     params => {
@@ -53,9 +55,6 @@ $params = $request->{params}->{checked};
 $params = uac::set_template_permissions( $request->{permissions}, $params );
 $params->{loc} = localization::get( $config, { user => $user, file => 'select-event' } );
 
-#process header
-print "Content-type:text/html; charset=UTF-8;\n\n";
-
 return unless uac::check( $config, $params, $user_presets ) == 1;
 show_events( $config, $request );
 
@@ -206,4 +205,3 @@ sub check_params {
 
     return $checked;
 }
-
diff --git a/website/agenda/planung/templates/edit-event.html b/website/agenda/planung/templates/edit-event.html
index 40de940..d0b71ac 100644
--- a/website/agenda/planung/templates/edit-event.html
+++ b/website/agenda/planung/templates/edit-event.html
@@ -192,10 +192,11 @@
                     <TMPL_VAR .loc.label_rerun_select_other>
                 </div>
                                 
-                <input id="rerunEventId" value="-1" style="display:none" onchange="copyFromEvent('rerunEventId')">
+                <input id="rerunEventId" value="-1" style="display:none" onchange="">
 
                 <div id="import_rerun" class="active text" style="display:none;"></div>
                 <button onclick="hideSelectRerun('rerunEventId')"><TMPL_VAR .loc.button_cancel></button>
+                <button onclick="if ($('#rerunEventId').val()) copyFromEvent('rerunEventId')"><TMPL_VAR .loc.button_apply></button>
             </div>
         </div>
     </TMPL_IF>
diff --git a/website/agenda/planung/templates/edit-series.html b/website/agenda/planung/templates/edit-series.html
index 563f0bd..f57135b 100644
--- a/website/agenda/planung/templates/edit-series.html
+++ b/website/agenda/planung/templates/edit-series.html
@@ -23,6 +23,15 @@
 	}
 </style>
 
+    <div class="panel-header">
+        <TMPL_IF has_single_events>
+            <TMPL_VAR .loc.single_events> <TMPL_IF title><TMPL_VAR title></TMPL_IF>
+        <TMPL_ELSE>
+            <TMPL_VAR .loc.title>
+            <TMPL_IF series_name> <TMPL_VAR series_name></TMPL_IF><TMPL_IF title> - <TMPL_VAR title></TMPL_IF>
+        </TMPL_IF>
+    </div>
+
 <!-- view series -->
 <div id="view_<TMPL_VAR .series_id>" class="view" style="clear:both">
 	<div class="buttons">
@@ -63,15 +72,6 @@
 
     </div>
 
-	<div class="panel-header">
-        <TMPL_IF has_single_events>
-            <TMPL_VAR .loc.single_events> <TMPL_IF title><TMPL_VAR title></TMPL_IF>
-        <TMPL_ELSE>
-            <TMPL_VAR .loc.title>
-			<TMPL_IF series_name> <TMPL_VAR series_name></TMPL_IF><TMPL_IF title> - <TMPL_VAR title></TMPL_IF>
-        </TMPL_IF>
-    </div>
-
 </div>
 
 <div id="tabs">
diff --git a/website/agenda/planung/user-selected-event.cgi b/website/agenda/planung/user-selected-event.cgi
index 0616924..20f4206 100644
--- a/website/agenda/planung/user-selected-event.cgi
+++ b/website/agenda/planung/user-selected-event.cgi
@@ -28,6 +28,8 @@ my $debug  = $config->{system}->{debug};
 my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( ( !defined $user ) || ( $user eq '' ) );
 
+print "Content-type:text/plain; charset=UTF-8;\n\n";
+
 my $user_presets = uac::get_user_presets(
     $config,
     {
@@ -48,8 +50,6 @@ my $request = {
     },
 };
 $request = uac::prepare_request( $request, $user_presets );
-
-print "Content-type:text/plain; charset=UTF-8;\n\n";
 return unless uac::check( $config, $params, {} ) == 1;
 log_event_selection( $config, $request, $user );