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

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2021-10-18 12:05:40 +02:00
parent b318ccb2af
commit 11230ebf7f
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/public/project/suggestbooth.php
View File

@ -526,7 +526,7 @@ print '<div id="divsubscribe">';
print '<div class="center subscriptionformhelptext justify">'; print '<div class="center subscriptionformhelptext justify">';
// Welcome message // Welcome message
$text = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationBoothWelcomeMessage").'</strong></td></tr></br>'; $text = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationBoothWelcomeMessage").'</strong></td></tr><br>';
$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationBoothHelpMessage").' '.$project->label.'.<br><br></td></tr>'."\n"; $text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationBoothHelpMessage").' '.$project->label.'.<br><br></td></tr>'."\n";
$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n"; $text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";
print $text; print $text;

2
htdocs/public/project/suggestconference.php
View File

@ -459,7 +459,7 @@ print '<div id="divsubscribe">';
print '<div class="center subscriptionformhelptext justify">'; print '<div class="center subscriptionformhelptext justify">';
// Welcome message // Welcome message
$text = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationConfWelcomeMessage").'</strong></td></tr></br>'; $text = '<tr><td class="textpublicpayment"><strong>'.$langs->trans("EvntOrgRegistrationConfWelcomeMessage").'</strong></td></tr><br>';
$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationConfHelpMessage").' '.$project->label.'.<br><br></td></tr>'."\n"; $text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationConfHelpMessage").' '.$project->label.'.<br><br></td></tr>'."\n";
$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n"; $text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'."\n";
print $text; print $text;

29
htdocs/public/project/viewandvote.php
View File

@ -101,20 +101,18 @@ if (empty($conf->eventorganization->enabled)) {
$tmpthirdparty = new Societe($db); $tmpthirdparty = new Societe($db);
$listOfConferences = $listOfBooths = '<tr><td>'.$langs->trans('Label').'</td> $listOfConferences = '<tr><td>'.$langs->trans('Label').'</td>';
<td>'.$langs->trans('Type').'</td> $listOfConferences .= '<td>'.$langs->trans('Type').'</td>';
<td>'.$langs->trans('DateStart').'</td> $listOfConferences .= '<td>'.$langs->trans('ThirdParty').'</td>';
<td>'.$langs->trans('DateEnd').'</td> $listOfConferences .= '<td>'.$langs->trans('Note').'</td></tr>';
<td>'.$langs->trans('Thirdparty').'</td>
<td>'.$langs->trans('Note').'</td></tr>';
$sql = "SELECT a.id, a.fk_action, a.datep, a.datep2, a.label, a.fk_soc, a.note, ca.libelle $sql = "SELECT a.id, a.fk_action, a.datep, a.datep2, a.label, a.fk_soc, a.note, ca.libelle as label
FROM ".MAIN_DB_PREFIX."actioncomm as a FROM ".MAIN_DB_PREFIX."actioncomm as a
INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as ca ON (a.fk_action=ca.id) INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as ca ON (a.fk_action=ca.id)
WHERE a.status<2"; WHERE a.status<2";
$sqlforconf = $sql." AND ca.module='conference@eventorganization'"; $sqlforconf = $sql." AND ca.module='conference@eventorganization'";
$sqlforbooth = $sql." AND ca.module='booth@eventorganization'"; //$sqlforbooth = $sql." AND ca.module='booth@eventorganization'";
// For conferences // For conferences
$result = $db->query($sqlforconf); $result = $db->query($sqlforconf);
@ -132,12 +130,13 @@ while ($i < $db->num_rows($result)) {
$thirdpartyname = ''; $thirdpartyname = '';
} }
$listOfConferences .= '<tr><td>'.$obj->label.'</td><td>'.$obj->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>'; $listOfConferences .= '<tr><td>'.$obj->label.'</td><td>'.$obj->label.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
$listOfConferences .= '<td><button type="submit" name="vote" value="'.$obj->id.'" class="button">'.$langs->trans("Vote").'</button></td></tr>'; $listOfConferences .= '<td><button type="submit" name="vote" value="'.$obj->id.'" class="button">'.$langs->trans("Vote").'</button></td></tr>';
$i++; $i++;
} }
// For booths // For booths
/*
$result = $db->query($sqlforbooth); $result = $db->query($sqlforbooth);
$i = 0; $i = 0;
while ($i < $db->num_rows($result)) { while ($i < $db->num_rows($result)) {
@ -157,6 +156,7 @@ while ($i < $db->num_rows($result)) {
$listOfBooths .= '<td><button type="submit" name="vote" value="'.$obj->id.'" class="button">'.$langs->trans("Vote").'</button></td></tr>'; $listOfBooths .= '<td><button type="submit" name="vote" value="'.$obj->id.'" class="button">'.$langs->trans("Vote").'</button></td></tr>';
$i++; $i++;
} }
*/
// Get vote result // Get vote result
$idvote = GETPOST("vote"); $idvote = GETPOST("vote");
@ -275,19 +275,20 @@ $text .= '<tr><td class="textpublicpayment">'.$project->note_public.'</td></tr>'
print $text; print $text;
print '</table>'."\n"; print '</table>'."\n";
print dol_get_fiche_head('');
print '<table border=1 cellpadding="10" id="conferences" class="center">'."\n"; print '<table cellpadding="10" id="conferences" border="1" class="center">'."\n";
print '<th colspan="7">'.$langs->trans("ListOfSuggestedConferences").'</th>'; print '<th colspan="7">'.$langs->trans("ListOfSuggestedConferences").'</th>';
print $listOfConferences.'</br>'; print $listOfConferences.'<br>';
print '</table>'."\n"; print '</table>'."\n";
print '</br>'; /*
print '<br>';
print '<table border=1 cellpadding="10" id="conferences" class="center">'."\n"; print '<table border=1 cellpadding="10" id="conferences" class="center">'."\n";
print '<th colspan="7">'.$langs->trans("ListOfSuggestedBooths").'</th>'; print '<th colspan="7">'.$langs->trans("ListOfSuggestedBooths").'</th>';
print $listOfBooths.'</br>'; print $listOfBooths.'<br>';
print '</table>'."\n"; print '</table>'."\n";
*/
$object = null; $object = null;