]> ruin.nu Git - ndwebbie.git/blobdiff - lib/NDWeb/Controller/Calls.pm
Use the new defprio view for calls
[ndwebbie.git] / lib / NDWeb / Controller / Calls.pm
index 2afedadab8e430e0cadfae04a1a43239a83b8705..7edc10b48bfad06506db7cc8a94cfa3d8913a07c 100644 (file)
@@ -54,23 +54,20 @@ sub list : Local {
 
        my $query = $dbh->prepare(qq{
                SELECT id,coords(x,y,z),planet,landing_tick,dc,curreta,fleets
-                       ,(0.2*(attack_points/GREATEST(a.attack,1))
-                               + 0.4*(defense_points/GREATEST(a.defense,1))
-                               + 0.2*(c.size/a.size) + 0.05*(c.score/a.score)
-                               + 0.15*(c.value/a.value))::Numeric(3,2) AS defprio
+                       ,defprio
                        ,array_accum(COALESCE(race::text,'')) AS race
                        ,array_accum(COALESCE(amount,0)) AS amount
                        ,array_accum(COALESCE(eta,0)) AS eta
                        ,array_accum(COALESCE(shiptype,'')) AS shiptype
                        ,array_accum(COALESCE(alliance,'?')) AS alliance
                        ,array_accum(coords) AS attackers
-               FROM (SELECT c.id, p.x,p.y,p.z,p.id AS planet, p.size, p.value, p.score
+               FROM (SELECT c.id, p.x,p.y,p.z,p.id AS planet, defprio
                        ,u.defense_points, u.attack_points, c.landing_tick
                        ,dc.username AS dc, (c.landing_tick - tick()) AS curreta
                        ,p2.race, i.amount, i.eta, i.shiptype, p2.alliance
-                       ,coords(p2.x,p2.y,p2.z),        COUNT(DISTINCT f.fid) AS fleets
-                       FROM calls c 
-                               JOIN users u ON c.member = u.uid
+                       ,coords(p2.x,p2.y,p2.z), COUNT(DISTINCT f.fid) AS fleets
+                       FROM calls c
+                               JOIN users_defprio u ON c.member = u.uid
                                JOIN current_planet_stats p ON u.planet = p.id
                                LEFT OUTER JOIN incomings i ON i.call = c.id
                                LEFT OUTER JOIN current_planet_stats p2 ON i.sender = p2.id
@@ -78,18 +75,12 @@ sub list : Local {
                                LEFT OUTER JOIN launch_confirmations f ON f.target = u.planet
                                        AND f.landing_tick = c.landing_tick AND f.back = f.landing_tick + f.eta - 1
                        WHERE $where
-                       GROUP BY c.id, p.x,p.y,p.z,p.id, p.size, p.score, p.value, c.landing_tick
+                       GROUP BY c.id, p.x,p.y,p.z,p.id, defprio, c.landing_tick
                                ,u.defense_points,u.attack_points,dc.username
                                ,p2.race,i.amount,i.eta,i.shiptype,p2.alliance,p2.x,p2.y,p2.z
                        ) c
-                       ,(SELECT avg(attack_points) AS attack, avg(defense_points) AS defense
-                               , avg(size) AS size, avg(score) AS score, avg(value) AS value
-                               FROM users u JOIN current_planet_stats p ON p.id = u.planet
-                               WHERE uid IN (SELECT uid FROM groupmembers  where gid = 2)
-                       ) a
                GROUP BY id, x,y,z,planet,landing_tick, defense_points, attack_points
-                       ,dc,curreta,fleets, c.size, c.score, c.value
-                       , a.attack, a.defense, a.size, a.score, a.value
+                       ,dc,curreta,fleets, defprio
                ORDER BY $order
                });
        $query->execute;
@@ -164,10 +155,20 @@ sub edit : Local {
                }
                push @fleets, $fleet;
        }
+
+       my $available = $dbh->prepare(q{
+SELECT ship,amount from ships_home WHERE planet = $1 AND tick = $2
+               });
+       $available->execute($call->{planet}, $call->{landing_tick});
+       my $fleet = {fid => $call->{member}, mission => 'Available'
+               , name => 'At home', ships => $available->fetchall_arrayref({})
+       };
+       push @fleets, $fleet;
+
        $c->stash(fleets => \@fleets);
 
        my $defenders = $dbh->prepare(q{ 
-SELECT DISTINCT ON (x,y,z,s.id,name,amount) fid,mission, name, eta
+SELECT DISTINCT ON (x,y,z,s.id,name,amount,back) fid,mission, name, eta
        , amount, coords(x,y,z) AS coords, landing_tick AS tick, f.planet
        ,back, (back <> landing_tick + eta - 1) AS recalled
 FROM launch_confirmations lc
@@ -231,13 +232,14 @@ sub defleeches : Local {
 
        my $query = $dbh->prepare(q{SELECT username,defense_points,count(id) AS calls
                , SUM(fleets) AS fleets, SUM(recalled) AS recalled
+               ,count(NULLIF(fleets,0)) AS defended_calls
                FROM (SELECT username,defense_points,c.id,count(f.target) AS fleets
                        , count(NULLIF(f.landing_tick + f.eta -1 = f.back,TRUE)) AS recalled
                        FROM users u JOIN calls c ON c.member = u.uid
                                LEFT OUTER JOIN (
                                        SELECT * FROM launch_confirmations JOIN fleets USING (fid)
+                                       WHERE mission = 'Defend'
                                ) f ON u.planet = f.target AND c.landing_tick = f.landing_tick
-                       WHERE f.mission = 'Defend'
                        GROUP BY username,defense_points,c.id
                ) d
                GROUP BY username,defense_points ORDER BY fleets DESC, defense_points
@@ -281,6 +283,12 @@ sub postcallupdate : Local {
                                ,undef,$c->req->param('info'),$call->{id});
                        $log->execute($c->user->id,$call->{ftid},"Updated info");
                }
+               if ($c->req->param('ccalc')){
+                       my $calc = $c->req->param('calc');
+                       $dbh->do(q{UPDATE calls SET calc = ? WHERE id = ?}
+                               ,undef,$calc,$call->{id});
+                       $log->execute($c->user->id,$call->{ftid},html_escape('Updated calc to: [URL]'.$calc.'[/URL]'));
+               }
        }elsif($c->req->param('cmd') =~ /^(Cover|Uncover|Ignore|Open|Take) call$/){
                my $extra_vars = '';
                if ($1 eq 'Cover'){
@@ -351,7 +359,7 @@ sub findCall : Private {
        my $query = $dbh->prepare(q{
                SELECT c.id, coords(p.x,p.y,p.z), c.landing_tick, c.info, covered
                        ,open, dc.username AS dc, u.defense_points,c.member AS uid
-                       ,u.planet, u.username AS member, u.sms,c.ftid
+                       ,u.planet, u.username AS member, u.sms,c.ftid,calc
                FROM calls c 
                JOIN users u ON c.member = u.uid
                LEFT OUTER JOIN users dc ON c.dc = dc.uid