From 3b99f0ebacd4601cffbcc66be56d0df2dff28c93 Mon Sep 17 00:00:00 2001
From: Leif Andersson <leif.andersson@control.lth.se>
Date: Fri, 17 Jan 2020 11:20:49 +0100
Subject: [PATCH] =?UTF-8?q?B=C3=B6rjade=20l=C3=A4gga=20till=20epost=20i=20?=
=?UTF-8?q?printGroup.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
action.printGroup.php | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/action.printGroup.php b/action.printGroup.php
index 438e49f..4de8e53 100644
--- a/action.printGroup.php
+++ b/action.printGroup.php
@@ -19,20 +19,22 @@ $HEAD = <<<EOS
EOS;
-
+$colmax = 6;
$members = Person::getGroupMembers($ID);
$addresses = array();
foreach ($members as $member) {
- $adr = '<tr>';
- if (trim($member->Namn)) $adr .= '<td>'.$member->Namn.'</td>';
+ $adr = '<tr>'; $col = 0;
+ if (trim($member->Namn)) {$adr .= '<td>'.$member->Namn.'</td>'; $col++;}
- if ($member->SkolaForetag) $adr .= '<td>'.$member->SkolaForetag.'</td>';
- if ($member->Avdelning) $adr .= '<td>'.$member->Avdelning.'</td>';
- if (!$member->Adress) {$member->Adress = $member->Hem;}
+ if ($member->SkolaForetag) {$adr .= '<td>'.$member->SkolaForetag.'</td>';$col++;}
+ if ($member->Avdelning) {$adr .= '<td>'.$member->Avdelning.'</td>'; $col++;}
+ if (!$member->Adress) {$member->Adress = $member->Hem; $col++;}
if ($member->Adress) {
$aas = explode("\n",$member->Adress);
foreach($aas as $aa) $adr .= '<td>'. $aa .'</td>';
+ $col++;
}
+ for ($i = $col; $i < $colmax; $i++) $adr .= '<td>x</td>';
$adr .= '</tr>';
$addresses[] = $adr;
}
--
GitLab