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

link ics ok (todo: add name of speaker)

Browse Source
This commit is contained in:
Dorian Vabre 2021-05-20 17:24:27 +02:00
parent df81ac8622
commit 720a368b29
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/comm/action/class/actioncomm.class.php
View File

@ -1901,8 +1901,11 @@ class ActionComm extends CommonObject
$sql .= " AND ar.fk_element = 0"; $sql .= " AND ar.fk_element = 0";
} }
} }
if ($key == 'author') { if ($key == 'module') {
$sql .= " AND u.lastname = '".$this->db->escape($value)."'"; $sql .= " AND c.module LIKE '%".$value."'";
}
if ($key == 'status') {
$sql .= " AND a.status =".$value;
} }
} }

2
htdocs/eventorganization/class/conferenceorbooth.class.php
View File

@ -134,6 +134,8 @@ class ConferenceOrBooth extends ActionComm
public $status; public $status;
// END MODULEBUILDER PROPERTIES // END MODULEBUILDER PROPERTIES
public $pubregister;
/** /**
* Constructor * Constructor
* *

7
htdocs/eventorganization/conferenceorbooth_list.php
View File

@ -430,11 +430,11 @@ if ($projectid > 0) {
// Define $urlwithroot // Define $urlwithroot
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root)); $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
$getentity = ($conf->entity > 1 ? "&entity=".$conf->entity : "");
// Show message // Show message
$message = '<input type="text" id="onlinepaymenturl" class="quatrevingtpercent" value="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.$getentity. $message = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...')."&project=".$projectid.'">'; $message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
$message .= "&project=".$projectid.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').'</a>';
$message .= '</div>'; $message .= '</div>';
$message .= '<br>'; $message .= '<br>';
print $message; print $message;
@ -457,6 +457,7 @@ if ($projectid > 0) {
// -------------------------------------------------------------------- // --------------------------------------------------------------------
$sql = 'SELECT '; $sql = 'SELECT ';
$sql .= $object->getFieldList('t'); $sql .= $object->getFieldList('t');
// Add fields from extrafields // Add fields from extrafields
if (!empty($extrafields->attributes[$object->table_element]['label'])) { if (!empty($extrafields->attributes[$object->table_element]['label'])) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) { foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {

1
htdocs/langs/en_US/eventorganization.lang
View File

@ -82,6 +82,7 @@ PriceOfBoothHelp=Subscription price to stand a booth
EventOrganizationICSLink=Link ICS for events EventOrganizationICSLink=Link ICS for events
ConferenceOrBoothInformation=Conference Or Booth informations ConferenceOrBoothInformation=Conference Or Booth informations
Attendees = Attendees Attendees = Attendees
DownloadICSLink = Download ICS link
EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference

17
htdocs/public/agenda/agendaexport.php
View File

@ -135,11 +135,11 @@ if (GETPOST("notolderthan", 'int')) {
} else { } else {
$filters['notolderthan'] = $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY; $filters['notolderthan'] = $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
} }
if (GETPOST("author", 'apha')) { if (GETPOST("module", 'alpha')) {
$filters['author'] = GETPOST("author", 'apha'); $filters['module'] = GETPOST("module", 'alpha');
} }
if (GETPOST("module", 'apha')) { if (GETPOST("status", 'int')) {
$filters['module'] = GETPOST("module", 'apha'); $filters['status'] = GETPOST("status", 'int');
} }
// Check config // Check config
if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY)) { if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY)) {
@ -206,6 +206,15 @@ foreach ($filters as $key => $value) {
if ($key == 'notactiontype') { if ($key == 'notactiontype') {
$filename .= '-notactiontype'.$value; $filename .= '-notactiontype'.$value;
} }
if ($key == 'actiontype') {
$filename .= '-actiontype'.$value;
}
if ($key == 'module') {
$filename .= '-module'.$value;
}
if ($key == 'status') {
$filename .= '-status'.$value;
}
} }
// Add extension // Add extension
if ($format == 'vcal') { if ($format == 'vcal') {