From a4018f41f7f36f47a9f7b189ecf4eda98a0b9c26 Mon Sep 17 00:00:00 2001
From: atm-lena <lena@atm-consulting.fr>
Date: Wed, 26 Aug 2020 10:52:36 +0200
Subject: [PATCH] WIP

---
 htdocs/comm/action/card.php           | 6 ++++--
 htdocs/core/class/html.form.class.php | 7 ++++++-
 htdocs/langs/en_US/agenda.lang        | 4 ++++
 htdocs/langs/fr_FR/agenda.lang        | 3 ++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index cda05d21784..b31d6a4d226 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -66,7 +66,8 @@ $p2min = GETPOST('p2min');
 
 $offsetvalue = GETPOST('offsetvalue');
 $offsetunit = GETPOST('offsetunittype_duration');
-$typeremind = GETPOST('typeremind');
+$remindertype = GETPOST('remindertype');
+$modelmail = GETPOST('eventpushmodel_mail');
 
 $datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth"), GETPOST("apday"), GETPOST("apyear"));
 $datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month"), GETPOST("p2day"), GETPOST("p2year"));
@@ -1113,7 +1114,8 @@ if ($action == 'create')
 
     if($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
     {
-        print '<br><hr><br>';
+        print '<br><br><hr>';
+        print load_fiche_titre($langs->trans("AddReminder"), '', '');
 
         print '<table class="border centpercent">';
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 8d54dc78b13..e3757e3c0ed 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5673,7 +5673,7 @@ class Form
 		return $retstring;
 	}
 
-	public function select_type_duration($prefix){
+	public function select_type_duration($prefix, $selected = 'month'){
 
         global $langs;
 
@@ -5684,7 +5684,12 @@ class Form
         $retstring .= '<select class="flat" id="select_'.$prefix.'type_duration" name="'.$prefix.'type_duration">';
 
         foreach($TDurationTypes as $key=>$typeduration){
+
             $retstring .= '<option value="'.$key.'"';
+            if($key == $selected)
+            {
+                $retstring .= " selected";
+            }
             $retstring .= ">".$typeduration."</option>";
         }
 
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index d048a758996..6d59e464660 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -160,3 +160,7 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index e0d3e1fcbdf..8a097ed73d2 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -158,6 +158,7 @@ DateStartPlusOne=Date de début + 1 heure
 SetAllEventsToTodo=Réglez tous les événements à "A faire"
 SetAllEventsToInProgress=Définir tous les événements à "En cours"
 SetAllEventsToFinished=Définir tous les événements sur "Terminés"
-ReminderTime=Durée du rappel
+ReminderTime=Délai de rappel avant l'événement
 TimeType=Type de durée
 ReminderType=Type de rappel
+AddReminder=Créer une notification de rappel automatique pour cet évènement