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

Show dates and location on registration page

Browse Source
This commit is contained in:
Laurent Destailleur 2022-10-21 14:01:36 +02:00
parent fc64bcf56f
commit 4b50bf9963
2 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/projet/card.php
View File

@ -60,8 +60,8 @@ $objcanvas = GETPOST("objcanvas", "alphanohtml");
$comefromclone = GETPOST("comefromclone", "alphanohtml");
$date_start = dol_mktime(0, 0, 0, GETPOST('projectstartmonth', 'int'), GETPOST('projectstartday', 'int'), GETPOST('projectstartyear', 'int'));
$date_end = dol_mktime(0, 0, 0, GETPOST('projectendmonth', 'int'), GETPOST('projectendday', 'int'), GETPOST('projectendyear', 'int'));
$date_start_event = dol_mktime(0, 0, 0, GETPOST('date_start_eventmonth', 'int'), GETPOST('date_start_eventday', 'int'), GETPOST('date_start_eventyear', 'int'));
$date_end_event = dol_mktime(0, 0, 0, GETPOST('date_end_eventmonth', 'int'), GETPOST('date_end_eventday', 'int'), GETPOST('date_end_eventyear', 'int'));
$date_start_event = dol_mktime(GETPOST('date_start_eventhour', 'int'), GETPOST('date_start_eventmin', 'int'), GETPOST('date_start_eventsec', 'int'), GETPOST('date_start_eventmonth', 'int'), GETPOST('date_start_eventday', 'int'), GETPOST('date_start_eventyear', 'int'));
$date_end_event = dol_mktime(GETPOST('date_end_eventhour', 'int'), GETPOST('date_end_eventmin', 'int'), GETPOST('date_end_eventsec', 'int'), GETPOST('date_end_eventmonth', 'int'), GETPOST('date_end_eventday', 'int'), GETPOST('date_end_eventyear', 'int'));
$location = GETPOST('location', 'alphanohtml');
@ -734,9 +734,9 @@ if ($action == 'create' && $user->rights->projet->creer) {
if (isModEnabled('eventorganization')) {
// Date event
print '<tr class="classuseorganizeevent"><td>'.$langs->trans("Date").' ('.$langs->trans("Event").')</td><td>';
print $form->selectDate(($date_start_event ? $date_start_event : -1), 'date_start_event', 0, 0, 0, '', 1, 0);
print $form->selectDate(($date_start_event ? $date_start_event : -1), 'date_start_event', 1, 1, 1, '', 1, 0);
print ' <span class="opacitymedium"> '.$langs->trans("to").' </span> ';
print $form->selectDate(($date_end_event ? $date_end_event : -1), 'date_end_event', 0, 0, 0, '', 1, 0);
print $form->selectDate(($date_end_event ? $date_end_event : -1), 'date_end_event', 1, 1, 1, '', 1, 0);
print '</td></tr>';
// Location
@ -1056,9 +1056,9 @@ if ($action == 'create' && $user->rights->projet->creer) {
if (isModEnabled('eventorganization')) {
// Date event
print '<tr class="classuseorganizeevent"><td>'.$langs->trans("Date").' ('.$langs->trans("Event").')</td><td>';
print $form->selectDate(($date_start_event ? $date_start_event : ($object->date_start_event ? $object->date_start_event : -1)), 'date_start_event', 0, 0, 0, '', 1, 0);
print $form->selectDate(($date_start_event ? $date_start_event : ($object->date_start_event ? $object->date_start_event : -1)), 'date_start_event', 1, 1, 1, '', 1, 0);
print ' <span class="opacitymedium"> '.$langs->trans("to").' </span> ';
print $form->selectDate(($date_end_event ? $date_end_event : ($object->date_end_event ? $object->date_end_event : -1)), 'date_end_event', 0, 0, 0, '', 1, 0);
print $form->selectDate(($date_end_event ? $date_end_event : ($object->date_end_event ? $object->date_end_event : -1)), 'date_end_event', 1, 1, 1, '', 1, 0);
print '</td></tr>';
// Location

41
htdocs/public/eventorganization/attendee_new.php
View File

@ -524,8 +524,11 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
$labelforproduct = $outputlangs->trans("EventFee", $project->title);
$date_start = $project->date_start;
$date_end = $project->date_end;
if ($project->location) {
$labelforproduct .= ' - '.$project->location;
}
$date_start = $project->date_start_event;
$date_end = $project->date_end_event;
// If there is no lines yet, we add one
if (empty($facture->lines)) {
@ -652,8 +655,36 @@ print '<div class="center subscriptionformhelptext">';
print '<span class="opacitymedium">'.$langs->trans("EvntOrgWelcomeMessage").'</span>';
print '<br>';
print '<span class="eventlabel">'.$project->title . ' '. $conference->label.'</span>';
print '<br>';
print '<span class="eventlabel">'.$project->title . ' '. $conference->label.'</span><br>';
if ($project->date_start_event || $project->date_end_event) {
print '<span class="fa fa-calendar pictofixedwidth"></span>';
}
if ($project->date_start_event) {
$format = 'day';
$tmparray = dol_getdate($project->date_start_event, false, '');
if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
$format = 'dayhour';
}
print dol_print_date($project->date_start_event, $format);
}
if ($project->date_start_event && $project->date_end_event) {
print ' - ';
}
if ($project->date_end_event) {
$format = 'day';
$tmparray = dol_getdate($project->date_end_event, false, '');
if ($tmparray['hours'] || $tmparray['minutes'] || $tmparray['minutes']) {
$format = 'dayhour';
}
print dol_print_date($project->date_end_event, $format);
}
if ($project->date_start_event || $project->date_end_event) {
print '<br>';
}
if ($project->location) {
print '<span class="fa fa-map-marked-alt pictofixedwidth"></span>'.$project->location.'<br>';
}
$maxattendees = 0;
if ($conference->id > 0) {
/* date of project is not date of event so commented
@ -812,8 +843,8 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
}
print '</div>';
print "</form>\n";
print "<br>";
print '</div></div>';
}