Netsyms/HACHEMembershipPortal
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Exclude "private" members from directory and flag them in other reports (close #18)

Browse Source
This commit is contained in:
Skylar Ittner 2018-12-17 19:54:57 -07:00
parent 48917e6bce
commit f851b240f5
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
langs/en/labels.json
View File

@ -55,5 +55,6 @@
"All members expired or expiring within a month.": "All members expired or expiring within a month.", "All members expired or expiring within a month.": "All members expired or expiring within a month.",
"All the data from the member directory in a spreadsheet.": "All the data from the member directory in a spreadsheet.", "All the data from the member directory in a spreadsheet.": "All the data from the member directory in a spreadsheet.",
"A formatted and up-to-date HACHE member directory.": "A formatted and up-to-date HACHE member directory.", "A formatted and up-to-date HACHE member directory.": "A formatted and up-to-date HACHE member directory.",
"Member wishes to be remain private (excluded from member directory)": "Member wishes to be remain private (excluded from member directory)" "Member wishes to be remain private (excluded from member directory)": "Member wishes to be remain private (excluded from member directory)",
"Private": "Private"
} }

6
lib/mkmemberdirectory.php
View File

@ -21,7 +21,11 @@ use Dompdf\Dompdf;
$familylist = $database->select("families", "familyid", ["ORDER" => ["familyname"]]); $familylist = $database->select("families", "familyid", ["ORDER" => ["familyname"]]);
$families = []; $families = [];
foreach ($familylist as $f) { foreach ($familylist as $f) {
$families[] = (new Family())->load($f); $fam = (new Family())->load($f);
if ($fam->getPrivate()) {
continue;
}
$families[] = $fam;
} }
$format = "html"; $format = "html";

7
lib/reports.php
View File

@ -59,11 +59,13 @@ function getMemberReport($filter = []): Report {
$Strings->get("Photo Permission", false), $Strings->get("Photo Permission", false),
$Strings->get("Newsletter", false), $Strings->get("Newsletter", false),
$Strings->get("Expires", false), $Strings->get("Expires", false),
$Strings->get("Children", false) $Strings->get("Private", false),
$Strings->get("Children", false),
]); ]);
$families = []; $families = [];
foreach ($familyids as $id) { foreach ($familyids as $id) {
$families[] = (new Family())->load($id); $f = (new Family())->load($id);
$families[] = $f;
} }
foreach ($families as $f) { foreach ($families as $f) {
$newsletter = ""; $newsletter = "";
@ -95,6 +97,7 @@ function getMemberReport($filter = []): Report {
$f->getPhotoPermission() ? $Strings->get("Yes", false) : $Strings->get("No", false), $f->getPhotoPermission() ? $Strings->get("Yes", false) : $Strings->get("No", false),
$newsletter, $newsletter,
date("Y-m-d", $f->getExpires()), date("Y-m-d", $f->getExpires()),
$f->getPrivate() ? $Strings->get("Yes", false) : $Strings->get("No", false),
implode(", ", $children) implode(", ", $children)
]); ]);
} }