From: Michael Andreen Date: Thu, 17 Jul 2008 21:27:38 +0000 (+0200) Subject: Converted alliances page X-Git-Url: https://ruin.nu/git/%3CTMPL_VAR%20NAME=PAGE%3E?a=commitdiff_plain;h=e4aab4e872225a7b325949f5632650430595cef6;p=ndwebbie.git Converted alliances page --- diff --git a/NDWeb/Pages/Alliances.pm b/NDWeb/Pages/Alliances.pm deleted file mode 100644 index 59106e6..0000000 --- a/NDWeb/Pages/Alliances.pm +++ /dev/null @@ -1,163 +0,0 @@ -#************************************************************************** -# Copyright (C) 2006 by Michael Andreen * -# * -# 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::Alliances; -use strict; -use warnings FATAL => 'all'; -use ND::Include; -use CGI qw/:standard/; -use NDWeb::Include; - -use base qw/NDWeb::XMLPage/; - -$NDWeb::Page::PAGES{alliances} = __PACKAGE__; - -sub render_body { - my $self = shift; - my ($BODY) = @_; - $self->{TITLE} = 'Alliances'; - my $DBH = $self->{DBH}; - - return $self->noAccess unless $self->isHC; - - my $alliance; - if (defined param('alliance') && param('alliance') =~ /^(\d+)$/){ - my $query = $DBH->prepare(q{SELECT id,name, relationship FROM alliances WHERE id = ?}); - $alliance = $DBH->selectrow_hashref($query,undef,$1); - } - if ($alliance && defined param('cmd') && param ('cmd') eq 'change'){ - $DBH->begin_work; - if (param('crelationship')){ - my $value = escapeHTML(param('relationship')); - if ($DBH->do(q{UPDATE alliances SET relationship = ? WHERE id =?} - ,undef,$value,$alliance->{id})){ - $alliance->{relationship} = $value; - log_message $ND::UID,"HC set alliance: $alliance->{id} ($alliance->{name}) relationship: $value"; - }else{ - warn $DBH->errstr; - } - } - my $coords = param('coords'); - my $findplanet = $DBH->prepare(q{SELECT id FROM current_planet_stats WHERE x = ? AND y = ? AND z = ?}); - my $addplanet = $DBH->prepare(q{ - UPDATE planets SET alliance_id = $2, nick = coalesce($3,nick) - WHERE id = $1; - }); - while ($coords =~ m/(\d+):(\d+):(\d+)(?:\s+nick=(\S+))?/g){ - my ($id) = $DBH->selectrow_array($findplanet,undef,$1,$2,$3) or $ND::ERROR .= p $DBH->errstr; - if ($addplanet->execute($id,$alliance->{id},$4)){ - my $nick = ''; - $nick = "(nick $4)" if defined $4; - warn "Added planet $1:$2:$3 $nick to this alliance\n"; - intel_log $ND::UID,$id,"HC Added planet $1:$2:$3 $nick to alliance: $alliance->{id} ($alliance->{name})"; - }else{ - warn $DBH->errstr; - } - } - $DBH->commit or warn $DBH->errstr; - }elsif ($alliance && defined param('cmd') && param ('cmd') eq 'remove_all'){ - $DBH->begin_work; - my ($coords) = $DBH->selectrow_array(q{SELECT CONCAT(coords(x,y,z) || ' ') - FROM current_planet_stats where alliance_id = $1 - },undef,$alliance->{id}); - my $removeplanets = $DBH->prepare(q{ - UPDATE planets SET alliance_id = NULL - WHERE alliance_id = $1; - }) or warn $DBH->errstr; - if ($removeplanets->execute($alliance->{id})){ - log_message $ND::UID, "HC cleaned alliance: $alliance->{id} ($alliance->{name})\n\n$coords"; - $DBH->commit or warn $DBH->errstr; - }else{ - warn $DBH->errstr; - $DBH->rollback; - } - } - - if ($alliance){ - $BODY->param(Alliance => $alliance->{name}); - $BODY->param(Id => $alliance->{id}); - my @relationships; - for my $relationship ("","Friendly", "NAP", "Hostile"){ - push @relationships,{Rel => $relationship, Selected => defined $alliance->{relationship} && $relationship eq $alliance->{relationship}} - } - $BODY->param(Relationships => \@relationships); - - my $order = "p.x,p.y,p.z"; - if (defined param('order') && param('order') =~ /^(score|size|value|xp|hit_us|race)$/){ - $order = "$1 DESC"; - } - my $members = $DBH->prepare(qq{ - SELECT coords(x,y,z), nick, ruler, planet, race, size, score, value, xp, - planet_status,hit_us, sizerank, scorerank, valuerank, xprank - FROM current_planet_stats p - WHERE p.alliance_id = ? - ORDER BY $order}); - my @members; - $members->execute($alliance->{id}); - while (my $member = $members->fetchrow_hashref){ - push @members,$member; - } - $BODY->param(Members => \@members); - - my $query = $DBH->prepare(intelquery('o.alliance AS oalliance,coords(o.x,o.y,o.z) AS origin, t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',q{not ingal AND (o.alliance_id = $1 OR t.alliance_id = $1) - AND (i.mission = 'Defend' OR i.mission = 'AllyDef') - AND ((( t.alliance_id != o.alliance_id OR t.alliance_id IS NULL OR o.alliance_id IS NULL))) - AND i.sender NOT IN (SELECT planet FROM users u NATURAL JOIN groupmembers gm WHERE gid = 8 AND planet IS NOT NULL) - AND NOT (i.back IS NOT NULL AND i.back = i.tick + 4) - })); - $query->execute($alliance->{id}) or warn $DBH->errstr; - - my @intel; - while (my $intel = $query->fetchrow_hashref){ - if ($intel->{ingal}){ - $intel->{missionclass} = 'ingal'; - }else{ - $intel->{missionclass} = $intel->{mission}; - } - push @intel,$intel; - } - $BODY->param(Intel => \@intel); - }else{ - - my $order = "score DESC"; - if (defined param('order') && param('order') =~ /^(score|kscore|size|ksize|members|kmem|kxp|kxp|scavg|kscavg|siavg|ksiavg|kxpavg|kvalue|kvalavg)$/){ - $order = "$1 DESC"; - } - my $query = $DBH->prepare(qq{ - SELECT DISTINCT a.id,name,COALESCE(s.score,SUM(p.score)) AS score,COALESCE(s.size,SUM(p.size)) AS size,s.members,count(p.score) AS kmem, - COALESCE(SUM(p.score),-1) AS kscore, COALESCE(SUM(p.size),-1) AS ksize, COALESCE(SUM(p.xp),-1) AS kxp,COALESCE(SUM(p.value),-1) AS kvalue, - COALESCE(s.score/s.members,-1) AS scavg, COALESCE(AVG(p.score)::int,-1) AS kscavg, COALESCE(s.size/s.members,-1) AS siavg, - COALESCE(AVG(p.size)::int,-1) AS ksiavg, COALESCE(AVG(p.xp)::int,-1) AS kxpavg, COALESCE(AVG(p.value)::int,-1) AS kvalavg - FROM alliances a - LEFT OUTER JOIN (SELECT * FROM alliance_stats WHERE tick = (SELECT max(tick) FROM alliance_stats)) s ON s.id = a.id - LEFT OUTER JOIN current_planet_stats p ON p.alliance_id = a.id - GROUP BY a.id,a.name,s.score,s.size,s.members - ORDER BY $order - })or warn $DBH->errstr; - $query->execute or warn $DBH->errstr; - my @alliances; - while (my $alliance = $query->fetchrow_hashref){ - next unless (defined $alliance->{score} || $alliance->{kscore} > 0); - push @alliances, $alliance; - } - $BODY->param(Alliances => \@alliances); - } - return $BODY; -} -1; diff --git a/lib/NDWeb/Controller/Alliances.pm b/lib/NDWeb/Controller/Alliances.pm index d7c4257..aa1c33d 100644 --- a/lib/NDWeb/Controller/Alliances.pm +++ b/lib/NDWeb/Controller/Alliances.pm @@ -4,6 +4,8 @@ use strict; use warnings; use parent 'Catalyst::Controller'; +use NDWeb::Include; + =head1 NAME NDWeb::Controller::Alliances - Catalyst Controller @@ -22,9 +24,152 @@ Catalyst Controller. =cut sub index :Path :Args(0) { - my ( $self, $c ) = @_; + my ( $self, $c ) = @_; + $c->stash(template => 'alliances/list.tt2'); + $c->forward('list'); +} + +sub list : Local { + my ( $self, $c, $order ) = @_; + my $dbh = $c->model; + + if (defined $order && $order =~ /^(score|kscore|size|ksize|members|kmem|kxp + |kxp|scavg|kscavg|siavg|ksiavg|kxpavg|kvalue|kvalavg)$/x){ + $order = "$1 DESC"; + } else { + $order = "score DESC"; + } + my $query = $dbh->prepare(q{ + SELECT DISTINCT a.id,name,COALESCE(s.score,SUM(p.score)) AS score + ,COALESCE(s.size,SUM(p.size)) AS size,s.members,count(p.score) AS kmem + ,COALESCE(SUM(p.score),-1) AS kscore + ,COALESCE(SUM(p.size),-1) AS ksize + ,COALESCE(SUM(p.xp),-1) AS kxp + ,COALESCE(SUM(p.value),-1) AS kvalue + ,COALESCE(s.score/LEAST(s.members,60),-1) AS scavg + ,COALESCE(AVG(p.score)::int,-1) AS kscavg + ,COALESCE(s.size/s.members,-1) AS siavg + ,COALESCE(AVG(p.size)::int,-1) AS ksiavg + ,COALESCE(AVG(p.xp)::int,-1) AS kxpavg + ,COALESCE(AVG(p.value)::int,-1) AS kvalavg + FROM alliances a + LEFT OUTER JOIN (SELECT * FROM alliance_stats + WHERE tick = (SELECT max(tick) FROM alliance_stats)) s ON s.id = a.id + LEFT OUTER JOIN current_planet_stats p ON p.alliance_id = a.id + GROUP BY a.id,a.name,s.score,s.size,s.members + HAVING s.score IS NOT NULL OR count(p.score) > 0 + ORDER BY + } . $order); + $query->execute; + $c->stash(alliances => $query->fetchall_arrayref({}) ); + $c->stash(comma => \&comma_value); +} + +sub edit : Local { + my ( $self, $c, $id, $order ) = @_; + my $dbh = $c->model; + + my $query = $dbh->prepare(q{SELECT id,name, relationship FROM alliances WHERE id = ?}); + my $a = $dbh->selectrow_hashref($query,undef,$id); + $c->stash(a => $a); + + + if ($order && $order =~ /^((score|size|value|xp|hit_us|race)(rank)?)$/){ + $order = $1; + }else { + $order = 'x,y,z'; + } + $c->stash(order => $order); + + $order .= ' DESC' if $order eq 'hit_us'; + + my $members = $dbh->prepare(q{ + SELECT coords(x,y,z), nick, ruler, planet, race, size, score, value, xp + ,planet_status,hit_us, sizerank, scorerank, valuerank, xprank + FROM current_planet_stats p + WHERE p.alliance_id = ? + ORDER BY + } . $order); + $members->execute($a->{id}); + $c->stash(members => $members->fetchall_arrayref({}) ); + + my $ticks = $c->req->param('ticks') || 48; + $c->stash(showticks => $ticks); + + my $query = $dbh->prepare(intelquery q{ + o.alliance AS oalliance ,coords(o.x,o.y,o.z) AS ocoords, i.sender + ,t.alliance AS talliance,coords(t.x,t.y,t.z) AS tcoords, i.target + },q{NOT ingal AND (o.alliance_id = $1 OR t.alliance_id = $1) + AND (i.mission = 'Defend' OR i.mission = 'AllyDef') + AND ((( t.alliance_id != o.alliance_id OR t.alliance_id IS NULL OR o.alliance_id IS NULL))) + AND i.sender NOT IN (SELECT planet FROM users u NATURAL JOIN groupmembers gm WHERE gid = 8 AND planet IS NOT NULL) + AND NOT (i.back IS NOT NULL AND i.back = i.tick + 4) + AND i.tick > (tick() - $2) + }); + $query->execute($a->{id}, $ticks); + $c->stash(intel => $query->fetchall_arrayref({}) ); +} + +sub postallianceupdate : Local { + my ( $self, $c, $id, $order ) = @_; + my $dbh = $c->model; + + $dbh->begin_work; + my $log = $dbh->prepare(q{INSERT INTO forum_posts (ftid,uid,message) VALUES( + (SELECT ftid FROM users WHERE uid = $1),$1,$2) + }); + if ($c->req->param('crelationship')){ + my $value = $c->req->param('relationship'); + $dbh->do(q{UPDATE alliances SET relationship = ? WHERE id =?} + ,undef,$value,$id); + $log->execute($c->user->id + ,"HC set alliance: $id relationship: $value"); + } + my $coords = $c->req->param('coords'); + my $findplanet = $dbh->prepare(q{SELECT id FROM current_planet_stats + WHERE x = ? AND y = ? AND z = ?}); + my $addplanet = $dbh->prepare(q{ + UPDATE planets SET alliance_id = $2, nick = coalesce($3,nick) + WHERE id = $1; + }); + my $text = ''; + while ($coords =~ m/(\d+):(\d+):(\d+)(?:\s+nick=(\S+))?/g){ + my ($planet) = $dbh->selectrow_array($findplanet,undef,$1,$2,$3); + $addplanet->execute($planet,$id,$4); + my $nick = ''; + $nick = "(nick $4)" if defined $4; + $text .= "($planet) $1:$2:$3 $nick\n"; + } + if ($text){ + $log->execute($c->user->id + ,"HC added the following planets to alliance $id:\n $text"); + } + $dbh->commit; + + $c->res->redirect($c->uri_for('edit',$id)); +} + +sub postremoveallplanets : Local { + my ( $self, $c, $id, $order ) = @_; + my $dbh = $c->model; - $c->response->body('Matched NDWeb::Controller::Alliances in Alliances.'); + $dbh->begin_work; + my $log = $dbh->prepare(q{INSERT INTO forum_posts (ftid,uid,message) VALUES( + (SELECT ftid FROM users WHERE uid = $1),$1,$2) + }); + my ($coords) = $dbh->selectrow_array(q{SELECT CONCAT(coords(x,y,z) || ' ') + FROM current_planet_stats where alliance_id = $1 + },undef,$id); + my $removeplanets = $dbh->prepare(q{ + UPDATE planets SET alliance_id = NULL + WHERE alliance_id = $1; + }); + $removeplanets->execute($id); + $log->execute($c->user->id + ,"HC cleaned alliance $id :\n\n$coords"); + $dbh->commit; + + $c->res->redirect($c->uri_for('edit',$id)); } sub hostile : Local { diff --git a/root/src/alliances/edit.tt2 b/root/src/alliances/edit.tt2 new file mode 100644 index 0000000..11501b6 --- /dev/null +++ b/root/src/alliances/edit.tt2 @@ -0,0 +1,85 @@ +[% META title = 'Edit Alliance' %] + +
Alliances: +
+
+

Alliance: [% a.name %]

+

Relationship: +

+

Paste a list of coords that you want to add to this alliance

+ +

+
+
+
+
+
+

Yes, remove all planets

+

+
+
+
+
+
+Alliance size and score vs members +Avg alliance size and score vs members +
+
+ + + + + + + + + + + + +[% FOR m IN members %] + + + + + + + + + + + +[% END %] +
CoordsNickHit usPlanetRaceSize (rank)Score (rank)Value (rank)XP (rank)
[% m.coords %][% m.nick %]([% m.planet_status %])[% m.hit_us %][% m.ruler %] OF [% m.planet %][% m.race %][% m.size %] ([% m.sizerank %])[% m.score %] ([% m.scorerank %])[% m.value %] ([% m.valuerank %])[% m.xp %] ([% m.xprank %])
+
+
+
+

Show last ticks

+
+ + + + + + + +[% FOR i IN intel %] + + + + + + + + + + + +[% END %] +
AllianceSenderMissionLanding tickETAAmountTargetAllianceReported by
[% i.oalliance %][% i.ocoords %][% i.mission %][% i.landingtick %][% i.eta %][% i.amount %][% i.tcoords %][% i.talliance %][% i.username %]
+
diff --git a/root/src/alliances/list.tt2 b/root/src/alliances/list.tt2 new file mode 100644 index 0000000..28b9f99 --- /dev/null +++ b/root/src/alliances/list.tt2 @@ -0,0 +1,40 @@ +[% META title = 'List Alliances' %] + + + + + + + + + + + + + + + + + + + +[% FOR a IN alliances %] + + + + + + + + + + + + + + + + + +[% END %] +
AllianceKmembersMembersScoreKScoreAvg ScoreKAvg scoreSizeKSizeAvg SizeKAvg sizeXPXP avgValueVal avg
[% a.name %][% a.kmem %][% a.members %][% comma(a.score) %][% comma(a.kscore) %][% comma(a.scavg) %][% comma(a.kscavg) %][% comma(a.size) %][% comma(a.ksize) %][% comma(a.siavg) %][% comma(a.ksiavg) %][% comma(a.kxp) %][% comma(a.kxpavg) %][% comma(a.kvalue) %][% comma(a.kvalavg) %]
diff --git a/templates/alliances.tmpl b/templates/alliances.tmpl deleted file mode 100644 index e009fcf..0000000 --- a/templates/alliances.tmpl +++ /dev/null @@ -1,114 +0,0 @@ - -
Alliances:
-
- - - -

Alliance:

-

Relationship: -

- -

Paste a list of coords that you want to add to this alliance

- -

-
-
-
-
- - - -

Yes, remove all planets

- -
-
-
-
-Alliance size and score vs members -Avg alliance size and score vs members -
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
CoordsNickHit usPlanetRaceSize (rank)Score (rank)Value (rank)XP (rank)
() OF () () () ()
-
-
- - - - - - - - - - - - - - - - - - - - - -
AllianceSenderMissionLanding tickETAAmountTargetAllianceIngalReported by
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
UserKnown membersTotal membersScore (known planets)Avg Score (known planets)Size (known planets)Avg Size (known planets)XP (avg)Value (avg)
() () () () () ()
-