lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
atm-lena 2020-08-26 10:52:36 +02:00
parent 7df993c7ed
commit a4018f41f7
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/action/card.php
View File

@ -66,7 +66,8 @@ $p2min = GETPOST('p2min');
$offsetvalue = GETPOST('offsetvalue'); $offsetvalue = GETPOST('offsetvalue');
$offsetunit = GETPOST('offsetunittype_duration'); $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")); $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")); $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) 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">'; print '<table class="border centpercent">';

7
htdocs/core/class/html.form.class.php
View File

@ -5673,7 +5673,7 @@ class Form
return $retstring; return $retstring;
} }
public function select_type_duration($prefix){ public function select_type_duration($prefix, $selected = 'month'){
global $langs; global $langs;
@ -5684,7 +5684,12 @@ class Form
$retstring .= '<select class="flat" id="select_'.$prefix.'type_duration" name="'.$prefix.'type_duration">'; $retstring .= '<select class="flat" id="select_'.$prefix.'type_duration" name="'.$prefix.'type_duration">';
foreach($TDurationTypes as $key=>$typeduration){ foreach($TDurationTypes as $key=>$typeduration){
$retstring .= '<option value="'.$key.'"'; $retstring .= '<option value="'.$key.'"';
if($key == $selected)
{
$retstring .= " selected";
}
$retstring .= ">".$typeduration."</option>"; $retstring .= ">".$typeduration."</option>";
} }

4
htdocs/langs/en_US/agenda.lang
View File

@ -160,3 +160,7 @@ DateStartPlusOne=Date start + 1 hour
SetAllEventsToTodo=Set all events to todo SetAllEventsToTodo=Set all events to todo
SetAllEventsToInProgress=Set all events to in progress SetAllEventsToInProgress=Set all events to in progress
SetAllEventsToFinished=Set all events to finished 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

3
htdocs/langs/fr_FR/agenda.lang
View File

@ -158,6 +158,7 @@ DateStartPlusOne=Date de début + 1 heure
SetAllEventsToTodo=Réglez tous les événements à "A faire" SetAllEventsToTodo=Réglez tous les événements à "A faire"
SetAllEventsToInProgress=Définir tous les événements à "En cours" SetAllEventsToInProgress=Définir tous les événements à "En cours"
SetAllEventsToFinished=Définir tous les événements sur "Terminés" 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 TimeType=Type de durée
ReminderType=Type de rappel ReminderType=Type de rappel
AddReminder=Créer une notification de rappel automatique pour cet évènement