diff --git a/css/style.css b/css/style.css index d8893ee..6f6b2b9 100644 --- a/css/style.css +++ b/css/style.css @@ -273,13 +273,20 @@ th.puzz-stats, td.puzz-stats { padding-top: 0.1em; } -th.ed-stats, td.ed-stats { +th.approval-ed-stats, td.approval-ed-stats { background-color: #B4C1E0; border: none; padding-bottom: 0.1em; padding-top: 0.1em; } +th.discussion-ed-stats, td.discussion-ed-stats { + background-color: #E4C4BA; + border: none; + padding-bottom: 0.1em; + padding-top: 0.1em; +} + th.p-stats, td.p-stats { background-color: #E0E0B4; border: none; diff --git a/html.php b/html.php index 19ea272..7a908a4 100644 --- a/html.php +++ b/html.php @@ -336,10 +336,15 @@ function displayPuzzleStats($uid) { $max_rows = 6; + + $totalNumberOfPuzzles = count(getAllLivePuzzles()); - $numberOfEditors = getNumberOfEditorsOnPuzzles(); + $numberOfEditors = getNumberOfEditorsOnPuzzles("discuss"); $moreThanThree = $totalNumberOfPuzzles - $numberOfEditors['0'] - $numberOfEditors['1'] - $numberOfEditors['2'] - $numberOfEditors['3']; + $numberOfApprovalEditors = getNumberOfEditorsOnPuzzles("approval"); + $moreThanThreeApproval = $totalNumberOfPuzzles - $numberOfApprovalEditors['0'] - $numberOfApprovalEditors['1'] - $numberOfApprovalEditors['2'] - $numberOfApprovalEditors['3']; + $userNumbers = getNumberOfPuzzlesForUser($uid); $editor = $userNumbers['editor']; @@ -378,30 +383,57 @@ function displayPuzzleStats($uid) - + + + + + + + + + + + + + + + + + + + + + + + + + +
Discuss Eds
Zero
One
Two
Three
>Three
+ + - + - - + + - - + + - - + + - - + + - - + +
Num of EditorsApproval Eds
ZeroZero
OneOne
TwoTwo
ThreeThree
>Three>Three
diff --git a/utils.php b/utils.php index 2a77017..0c817ab 100644 --- a/utils.php +++ b/utils.php @@ -3156,11 +3156,17 @@ function getRoundForPuzzle($pid) return get_rows($sql); } -function getNumberOfEditorsOnPuzzles() +function getNumberOfEditorsOnPuzzles($type) { + if ($type == "discuss") { + $queue = "editor_queue"; + } else { + $queue = "approver_queue"; + } + $deadstatusid = getDeadStatusId(); - $sql = sprintf('SELECT COUNT(editor_queue.uid) FROM puzzle_idea - LEFT JOIN editor_queue ON puzzle_idea.id=editor_queue.pid WHERE puzzle_idea.pstatus != %d + $sql = sprintf('SELECT COUNT('.$queue.'.uid) FROM puzzle_idea + LEFT JOIN '.$queue.' ON puzzle_idea.id='.$queue.'.pid WHERE puzzle_idea.pstatus != %d GROUP BY id', $deadstatusid); $numbers = get_elements($sql);