rod.wright/OpenDRS
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 15 Wiki Activity

Incorporated changes for release 1.3.0

Browse Source
This commit is contained in:
Rod Wright
2026-02-24 19:59:54 -05:00
parent 3667c4358f
commit 6e5c6e03e3
38 changed files with 610 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
distfiles/groups.php
View File

@@ -2,7 +2,7 @@
/*
groups.php
OpenDRS Online Discrepancy Reporting System
Copyright (C) 2021 Rod Wright
Copyright (C) 2022 Rod Wright
SPDX-License-Identifier: GPL-2.0
*/
@@ -38,7 +38,6 @@ $save=$incoming['save'];
$targets=$incoming['targets'];
$group=$incoming['group'];
$name=$incoming['name'];
$expandgrp=$incoming['expandgrp'];
$search=$incoming['search'];
$s_status=$incoming['s_status'];
@@ -317,7 +316,7 @@ if ($action=="add") {
if ($save) {
// show the group
$mode="view";
group_table($group,$role,$mode);
group_detail($group,$role,$mode);
if ($role) {
// show buttons
echo "
@@ -621,7 +620,7 @@ if ($action=="add") {
<input type=\"hidden\" name=\"group\" value=\"$group\">
<input type=\"hidden\" name=\"action\" value=\"remove\">
";
group_table($group,$role,"select","all");
group_detail($group,$role,"select","all");
echo "
Deselect the writeups you want to remove from this group. <br><br>
<b>NOTE:</b> Deselecting them all will dissolve the group.
@@ -653,7 +652,7 @@ if ($action=="add") {
}
// show the group
$mode="view";
group_table($group,$role,$mode);
group_detail($group,$role,$mode);
if ($role) {
// show buttons
echo "
@@ -694,7 +693,7 @@ if ($action=="add") {
}
// show the group
$mode="view";
group_table($group,$role,$mode);
group_detail($group,$role,$mode);
if ($role) {
// show buttons
echo "
@@ -720,7 +719,7 @@ if ($action=="add") {
}
// show the group
$mode="view";
group_table($group,$role,$mode);
group_detail($group,$role,$mode);
if ($role && ! $save) {
// show action form
echo "
@@ -821,7 +820,7 @@ if ($action=="add") {
if ($group) {
// show only the requested group
$mode="view";
group_table($group,$role,$mode);
group_detail($group,$role,$mode);
if ($role) {
// show buttons
echo "
@@ -841,48 +840,42 @@ if ($action=="add") {
}
echo "<hr><br>";
} else {
// show all groups
$mode="view";
$groups_qry=mysqli_query($drs_db,"select id from groups");
// show group table
$groups_qry=mysqli_query($drs_db,"select * from groups");
if (mysqli_num_rows($groups_qry)) {
echo "
<br><br>
<table border=\"1\" cellpadding=\"5\" style=\"width:100%;\">
<tr>
<th style=\"width:1%;\">ID</th>
<th>Name</th>
<th style=\"width:1%;\">Writeups assigned</th>
</tr>
";
while ($grouprow=mysqli_fetch_assoc($groups_qry)) {
if ($expandgrp == $grouprow['id']) {
group_table($grouprow['id'],$role,$mode,"none",$expandgrp);
if ($role) {
// show buttons
echo "
<form method=post action=\"groups.php\">
<input type=\"hidden\" name=\"group\" value=\"{$grouprow['id']}\">
<button name=\"action\" value=\"add\" type=\"submit\">Add writeups to this group</button>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button name=\"action\" value=\"remove\" type=\"submit\">Remove writeups from this group</button>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button name=\"action\" value=\"dissolve\" type=\"submit\">Dissolve this group</button>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button name=\"action\" value=\"setname\" type=\"submit\">Set name for this group</button>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button name=\"action\" value=\"takeaction\" type=\"submit\">Take group action</button>
</form>
";
}
} else {
echo "
<a href=\"groups.php?expandgrp={$grouprow['id']}\" style=\"text-decoration:none\">
<img src=\"icons/plus-white.png\" alt=\"Expand group\">
</a>
";
$groupname=dblookup($drs_db,"groups","id","name",$grouprow['id']);
if ($groupname == "") {
echo "<b>Group ID:</b> &nbsp;{$grouprow['id']}";
} else {
echo "<b>Group Name:</b> &nbsp;$groupname";
}
}
echo "<br><br>";
}
} else {
echo "<br>No writeup groups were found.<br><br><br>";
}
$num_query=mysqli_query($drs_db,"select id from links where linkgroup={$grouprow['id']}");
$num_writeups=mysqli_num_rows($num_query);
if($grouprow['name']=="") {
$name_text="Group {$grouprow['id']} has not been named";
} else {
$name_text="{$grouprow['name']}";
}
// print table row
printf(
"<tr>
<td align=\"center\" valign=\"top\"><a href=\"groups.php?group=%s\" title=\"View or change details of this group\">%s</a></td>
<td valign=\"top\">%s</td>
<td align=\"center\" valign=\"top\">%s</td>
</tr>\n",
$grouprow["id"],$grouprow["id"],
$name_text,
$num_writeups
);
}
echo "</table><br>";
} else {
echo "<br>No writeup groups were found.<br><br><br>";
}
}
}