]> ruin.nu Git - ndwebbie.git/commitdiff
Converted def leeches
authorMichael Andreen <harv@ruin.nu>
Tue, 15 Jul 2008 15:15:31 +0000 (17:15 +0200)
committerMichael Andreen <harv@ruin.nu>
Tue, 15 Jul 2008 21:28:43 +0000 (23:28 +0200)
NDWeb/Pages/DefLeeches.pm [deleted file]
database/group_roles.sql
lib/NDWeb.pm
lib/NDWeb/Controller/Calls.pm
root/lib/site/leftbar.tt2
root/src/calls/defleeches.tt2 [new file with mode: 0644]
templates/defLeeches.tmpl [deleted file]

diff --git a/NDWeb/Pages/DefLeeches.pm b/NDWeb/Pages/DefLeeches.pm
deleted file mode 100644 (file)
index d187bb6..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-#**************************************************************************
-#   Copyright (C) 2006 by Michael Andreen <harvATruinDOTnu>               *
-#                                                                         *
-#   This program is free software; you can redistribute it and/or modify  *
-#   it under the terms of the GNU General Public License as published by  *
-#   the Free Software Foundation; either version 2 of the License, or     *
-#   (at your option) any later version.                                   *
-#                                                                         *
-#   This program is distributed in the hope that it will be useful,       *
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-#   GNU General Public License for more details.                          *
-#                                                                         *
-#   You should have received a copy of the GNU General Public License     *
-#   along with this program; if not, write to the                         *
-#   Free Software Foundation, Inc.,                                       *
-#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
-#**************************************************************************/
-
-package NDWeb::Pages::DefLeeches;
-use strict;
-use warnings FATAL => 'all';
-use CGI qw/:standard/;
-use NDWeb::Include;
-
-use base qw/NDWeb::XMLPage/;
-
-$NDWeb::Page::PAGES{defLeeches} = __PACKAGE__;
-
-
-sub render_body {
-       my $self = shift;
-       my ($BODY) = @_;
-       $self->{TITLE} = 'Def Leeches';
-       my $DBH = $self->{DBH};
-
-       return $self->noAccess unless $self->isDC;
-
-       my $query = $DBH->prepare(q{SELECT username,defense_points,count(id) AS calls, SUM(fleets) AS fleets, SUM(recalled) AS recalled
-               FROM (SELECT username,defense_points,c.id,count(f.target) AS fleets, count(NULLIF(f.tick + f.eta -1 = f.back,TRUE)) AS recalled
-                       FROM users u JOIN calls c ON c.member = u.uid LEFT OUTER JOIN fleets f ON u.planet = f.target AND c.landing_tick = f.tick
-                       WHERE (f.mission = 'Defend' AND f.uid > 0 AND f.back IS NOT NULL AND NOT ingal)
-                               OR f.target IS NULL
-                       GROUP BY username,defense_points,c.id
-                       ) d
-               GROUP BY username,defense_points ORDER BY fleets DESC, defense_points
-               });
-       $query->execute;
-
-       my @members;
-       while ( my $member = $query->fetchrow_hashref){
-               push @members,$member;
-       }
-       $BODY->param(Members => \@members);
-       return $BODY;
-}
-
-1;
index fa2fd167bd2f10d504ce8a2bb8f1da0d5d60764b..c5bcd3251500285a90eb749453a96c0c7e086e9b 100644 (file)
@@ -24,6 +24,7 @@ INSERT INTO roles VALUES('members_points_nolimit');
 INSERT INTO roles VALUES('covop');
 INSERT INTO roles VALUES('calls_list');
 INSERT INTO roles VALUES('calls_edit');
+INSERT INTO roles VALUES('calls_leeches');
 INSERT INTO roles VALUES('raids_info');
 INSERT INTO roles VALUES('raids_edit');
 INSERT INTO roles VALUES('stats_intel');
@@ -45,6 +46,7 @@ INSERT INTO group_roles (gid,role) VALUES(2,'stats_planetdata');
 INSERT INTO group_roles (gid,role) VALUES(6,'dc_menu');
 INSERT INTO group_roles (gid,role) VALUES(6,'calls_list');
 INSERT INTO group_roles (gid,role) VALUES(6,'calls_edit');
+INSERT INTO group_roles (gid,role) VALUES(6,'calls_leeches');
 
 INSERT INTO group_roles (gid,role) VALUES(4,'bc_menu');
 INSERT INTO group_roles (gid,role) VALUES(4,'raids_info');
@@ -68,6 +70,7 @@ INSERT INTO group_roles (gid,role) VALUES(1,'alliances_resources');
 INSERT INTO group_roles (gid,role) VALUES(1,'graphs_intel');
 INSERT INTO group_roles (gid,role) VALUES(1,'calls_list');
 INSERT INTO group_roles (gid,role) VALUES(1,'calls_edit');
+INSERT INTO group_roles (gid,role) VALUES(1,'calls_leeches');
 INSERT INTO group_roles (gid,role) VALUES(1,'raids_info');
 INSERT INTO group_roles (gid,role) VALUES(1,'raids_edit');
 INSERT INTO group_roles (gid,role) VALUES(1,'intel');
@@ -82,6 +85,7 @@ INSERT INTO group_roles (gid,role) VALUES(3,'alliances_resources');
 INSERT INTO group_roles (gid,role) VALUES(3,'graphs_intel');
 INSERT INTO group_roles (gid,role) VALUES(3,'calls_list');
 INSERT INTO group_roles (gid,role) VALUES(3,'calls_edit');
+INSERT INTO group_roles (gid,role) VALUES(3,'calls_leeches');
 INSERT INTO group_roles (gid,role) VALUES(3,'raids_info');
 INSERT INTO group_roles (gid,role) VALUES(3,'raids_edit');
 INSERT INTO group_roles (gid,role) VALUES(3,'intel');
index 4edbcd0b6a402cbaf437e889cfb68fb69cc2ee2b..d2f151763f6a3067bcb0e76574c75af01d071215 100644 (file)
@@ -77,6 +77,7 @@ __PACKAGE__->deny_access_unless('/calls/list',[qw/calls_list/]);
 __PACKAGE__->deny_access_unless('/calls/postcallcomment',[qw/calls_edit/]);
 __PACKAGE__->deny_access_unless('/calls/postcallupdate',[qw/calls_edit/]);
 __PACKAGE__->deny_access_unless('/calls/postattackerupdate',[qw/calls_edit/]);
+__PACKAGE__->deny_access_unless('/calls/defleeches',[qw/calls_leeches/]);
 __PACKAGE__->deny_access_unless('/raids',[qw/raids_edit/]);
 __PACKAGE__->allow_access_if('/raids/index',1);
 __PACKAGE__->allow_access_if('/raids/view',1);
index cf468a88aaaa4701ed3730d5f883879e32997277..eca27be3fcc9f6431e06c966fe328aa776313fbb 100644 (file)
@@ -205,6 +205,28 @@ sub edit : Local {
        $c->forward('/forum/findPosts',[$call->{ftid}]);
 }
 
+sub defleeches : Local {
+       my ( $self, $c, $type ) = @_;
+       my $dbh = $c->model;
+
+       my $query = $dbh->prepare(q{SELECT username,defense_points,count(id) AS calls
+               , SUM(fleets) AS fleets, SUM(recalled) AS recalled
+               FROM (SELECT username,defense_points,c.id,count(f.target) AS fleets
+                       , count(NULLIF(f.tick + f.eta -1 = f.back,TRUE)) AS recalled
+                       FROM users u JOIN calls c ON c.member = u.uid
+                               LEFT OUTER JOIN fleets f ON u.planet = f.target
+                                       AND c.landing_tick = f.tick
+                       WHERE (f.mission = 'Defend' AND f.uid > 0 AND f.back IS NOT NULL AND NOT ingal)
+                               OR f.target IS NULL
+                       GROUP BY username,defense_points,c.id
+               ) d
+               GROUP BY username,defense_points ORDER BY fleets DESC, defense_points
+               });
+       $query->execute;
+
+       $c->stash(members => $query->fetchall_arrayref({}) );
+}
+
 sub postcallcomment : Local {
        my ($self, $c, $call) = @_;
 
index fc7258cb1626f9ff03614e2b239c707dd65ffa28..0926e5068d42c4fd8256fb3c1a2755f857395955 100644 (file)
@@ -72,7 +72,7 @@
 [% IF c.check_user_roles("dc_menu") %]
 <p>DC menu</p>
 <ul class="linkbar">
-       <li><a href="/defLeeches">Def Leeches</a></li>
+       <li><a href="/calls/defleeches">Def Leeches</a></li>
        <li><a href="/calls/list">Active calls</a></li>
        <li><a href="/calls/list/recent">Recent calls</a></li>
        <li><a href="/calls/list/uncovered">Not covered calls</a></li>
diff --git a/root/src/calls/defleeches.tt2 b/root/src/calls/defleeches.tt2
new file mode 100644 (file)
index 0000000..f2e32cd
--- /dev/null
@@ -0,0 +1,19 @@
+[% META title = 'Def Leeches' %]
+<table>
+       <tr>
+       <th>User</th>
+       <th>Def Points</th>
+       <th>Def Missions</th>
+       <th>Recalled missions</th>
+       <th>Calls</th>
+       </tr>
+[% FOR m IN members %]
+       <tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
+       <td>[% m.username %]</td>
+       <td>[% m.defense_points %]</td>
+       <td>[% m.fleets %]</td>
+       <td>[% m.recalled %]</td>
+       <td>[% m.calls %]</td>
+       </tr>
+[% END %]
+</table>
diff --git a/templates/defLeeches.tmpl b/templates/defLeeches.tmpl
deleted file mode 100644 (file)
index 4490582..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- <TMPL_VAR NAME=Page> -->
-<table>
-       <tr>
-       <th>User</th>
-       <th>Def Points</th>
-       <th>Def Missions</th>
-       <th>Recalled missions</th>
-       <th>Calls</th>
-       </tr>
-       <TMPL_LOOP Members>
-       <tr class="<TMPL_IF __odd__>odd<TMPL_ELSE>even</TMPL_IF>">
-       <td><TMPL_VAR NAME=Username></td>
-       <td><TMPL_VAR NAME=Defense_Points></td>
-       <td><TMPL_VAR NAME=Fleets></td>
-       <td><TMPL_VAR NAME=Recalled></td>
-       <td><TMPL_VAR NAME=Calls></td>
-       </tr>
-       </TMPL_LOOP>
-</table>