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

factorisation

Browse Source
This commit is contained in:
Dorian Vabre 2021-05-06 17:30:11 +02:00
parent 2e7d5e6d46
commit 166e15633b
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,51 +110,44 @@ $listOfConferences = $listOfBooths = '<tr><td>'.$langs->trans('Label').'</td>
<td>'.$langs->trans('DateStart').'</td> <td>'.$langs->trans('DateStart').'</td>
<td>'.$langs->trans('DateEnd').'</td> <td>'.$langs->trans('DateEnd').'</td>
<td>'.$langs->trans('Thirdparty').'</td> <td>'.$langs->trans('Thirdparty').'</td>
<td>'.$langs->trans('Note').'</td>'; <td>'.$langs->trans('Note').'</td></tr>';
// For conferences
$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
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 ca.module='conference@eventorganization' WHERE a.status<2";
AND a.status<2";
$result = $db->query($sql);
$sqlforconf = $sql." AND ca.module='conference@eventorganization'";
$sqlforbooth = $sql." AND ca.module='booth@eventorganization'";
// For conferences
$result = $db->query($sqlforconf);
$i = 0; $i = 0;
while ($i < $db->num_rows($result)) { while ($i < $db->num_rows($result)) {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$resultthirdparty = $tmpthirdparty->fetch($obj->fk_soc); $resultthirdparty = $tmpthirdparty->fetch($obj->fk_soc);
if ($resultthirdparty) { if ($resultthirdparty) {
$thirdpartyname = $tmpthirdparty->name; $thirdpartyname = $tmpthirdparty->name;
} else { } else {
$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->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
$listOfConferences .= '<td><input type="submit" value="'.$langs->trans("Vote").'" name="'.$obj->id.'" class="button"></td></tr>'; $listOfConferences .= '<td><input type="submit" value="'.$langs->trans("Vote").'" name="'.$obj->id.'" class="button"></td></tr>';
$i++; $i++;
} }
// For booths // For booths
$sql = "SELECT a.id, a.fk_action, a.datep, a.datep2, a.label, a.fk_soc, a.note, ca.libelle $result = $db->query($sqlforbooth);
FROM ".MAIN_DB_PREFIX."actioncomm as a
INNER JOIN ".MAIN_DB_PREFIX."c_actioncomm as ca ON (a.fk_action=ca.id)
WHERE ca.module='booth@eventorganization'
AND a.status<2";
$result = $db->query($sql);
$i = 0; $i = 0;
while ($i < $db->num_rows($result)) { while ($i < $db->num_rows($result)) {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$resultthirdparty = $tmpthirdparty->fetch($obj->fk_soc); $resultthirdparty = $tmpthirdparty->fetch($obj->fk_soc);
if ($resultthirdparty) { if ($resultthirdparty) {
$thirdpartyname = $tmpthirdparty->name; $thirdpartyname = $tmpthirdparty->name;
} else { } else {
$thirdpartyname = ''; $thirdpartyname = '';
} }
$listOfBooths .= '<tr><td>'.$obj->label.'</td><td>'.$obj->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>'; $listOfBooths .= '<tr><td>'.$obj->label.'</td><td>'.$obj->libelle.'</td><td>'.$obj->datep.'</td><td>'.$obj->datep2.'</td><td>'.$thirdpartyname.'</td><td>'.$obj->note.'</td>';
$listOfBooths .= '<td><input type="submit" value="'.$langs->trans("Vote").'" name="'.$obj->id.'" class="button"></td></tr>'; $listOfBooths .= '<td><input type="submit" value="'.$langs->trans("Vote").'" name="'.$obj->id.'" class="button"></td></tr>';
$i++; $i++;