From f28d53f789a784547bfe27fc2b744d1798152ab3 Mon Sep 17 00:00:00 2001
From: Tom Lake <tswsl1989@sucs.org>
Date: Thu, 27 Sep 2012 13:50:00 +0000
Subject: [PATCH] Further tweaks and improvements to SUSignup Admin component
---
components/susignup-admin.php | 12 +++++++++++-
htdocs/css/susignup-admin.css | 6 +++---
templates/susignup-admin.tpl | 4 ++++
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/components/susignup-admin.php b/components/susignup-admin.php
index eb27cfe..9751558 100644
--- a/components/susignup-admin.php
+++ b/components/susignup-admin.php
@@ -206,13 +206,23 @@ if (isset($session->groups[$permission])) {
$apiResult = curl_exec($apiReq);
$sumembers = su_response_decode($apiResult);
$matches = array();
+ $others=0;
+ $paidup=0;
foreach ($sumembers as $sumem) {
$sucsmem = get_sucs_record($sumem['uni_card_number']);
if ($sucsmem && $sucsmem['paid'] != paidUntil(time()) && $sucsmem['type']==1) {
$matches[]=array($sumem['firstName']." ".$sumem['lastName'], $sucsmem['realname'], $sumem['uni_card_number'], $sucsmem['username'], $sucsmem['paid']);
+ } else if ($sucsmem && $sucsmem['paid'] == paidUntil(time())) {
+ $others++;
+ $paidup++;
+ } else {
+ $others++;
}
}
$smarty->assign("matches", $matches);
+ $smarty->assign("others", $others);
+ $smarty->assign("paidup", $paidup);
+ $smarty->assign("pending", $others - $paidup);
} else if ($mode == 'renewals2') {
$failures = array();
$successes = array();
@@ -255,7 +265,7 @@ function get_sucs_record($sid) {
$query = "SELECT * FROM members WHERE sid=?;";
$res = $sucsDB->Execute($query, array($sid));
- if (!$res || $res->RecordCount()>1) {
+ if (!$res || $res->RecordCount()<>1) {
return FALSE;
}
return $res->FetchRow();
diff --git a/htdocs/css/susignup-admin.css b/htdocs/css/susignup-admin.css
index 8cd0251..1631a56 100644
--- a/htdocs/css/susignup-admin.css
+++ b/htdocs/css/susignup-admin.css
@@ -26,18 +26,18 @@ div.susignup-admin-menu input#rnsubmit {
#susignup-renewals {
width: 90%;
- border: 2px ridge;
+ border: 1px solid black;
border-collapse: collapse;
}
#susignup-renewals td {
- border: 2px ridge;
+ border: 1px solid black;
padding-left: 4px;
padding-right: 2px;
}
#susignup-renewals th {
- border: 2px ridge;
+ border: 1px solid black;
text-align: center;
padding-left: 2px;
padding-right: 2px;
diff --git a/templates/susignup-admin.tpl b/templates/susignup-admin.tpl
index 49a0b2b..a455340 100644
--- a/templates/susignup-admin.tpl
+++ b/templates/susignup-admin.tpl
@@ -23,6 +23,10 @@
</table>
<input type='hidden' name='mode' id='mode' value='renewals2' />
</form>
+{if $others > 0}
+<p>There were also <strong>{$others}</strong> other records found.<br />
+Of these, {$paidup} are current members and {$pending} are pending signups.</p>
+{/if}
{elseif $mode == 'renewals2'}
<div class='centre'>
<div class='cbb' style='text-align: left'>
--
GitLab