2 files changed, 70 insertions, 9 deletions

@@ -3,12 +3,73 @@ require_dependency "pokeviewer/application_controller"
 module Pokeviewer
   class PokemonController < ApplicationController
     def index
-      @trainers = Trainer.all
-      @unaccounted = Pokemon.where(trainer: nil)
+      pokemon = Pokemon.joins(:revisions).
+        order("trainer_id IS NULL DESC").
+        order(trainer_id: :asc).
+        order(box: :asc).
+        order(slot: :asc).
+        order("pokeviewer_revisions.sequential_id DESC").
+        group("pokeviewer_pokemon.uuid").
+        select(:box, :slot, :uuid, :trainer_id, :species_id).
+        select(:ot_gender, :ot_name, :unown_letter).
+        select("pokeviewer_revisions.nickname AS nickname").
+        chunk do |p|
+          if p.trainer_id.nil?
+            -1
+          else
+            p.trainer_id
+          end
+        end
+
+      if pokemon.peek.first == -1
+        @unaccounted = pokemon.next.second
+      else
+        @unaccounted = []
+      end
+
+      @trainers = Trainer.order(id: :asc).all.map do |trainer|
+        if trainer.id == pokemon.peek.first
+          party = []
+
+          boxes = (1..14).map do |i|
+            {
+              name: trainer.box_name(i),
+              pokemon: [nil] * 30
+            }
+          end
+
+          pokemon.next.second.chunk do |p|
+            if p.box.nil?
+              -1
+            else
+              p.box
+            end
+          end.each do |box, pokes|
+            if box == -1
+              party = pokes
+            else
+              boxes[box-1][:pokemon] = (0..29).map do |i|
+                if not pokes.empty? and (pokes.first.slot == i)
+                  pokes.shift
+                else
+                  nil
+                end
+              end
+            end
+          end
+
+          [trainer, party, boxes]
+        else
+          nil
+        end
+      end.compact
     end
 
     def show
-      @pokemon = Pokemon.find_by_uuid! params[:id]
+      @pokemon = Pokemon.includes(
+          :trainer, :species, :location,
+          revisions: [:item, :move_1, :move_2, :move_3, :move_4]
+        ).find_by_uuid! params[:id]
     end
   end
 end
@@ -1,4 +1,4 @@
-- @trainers.each do |trainer|
+- @trainers.each do |trainer, party, boxes|
   .trainer
     .trainer-info{ class: trainer.game }
       %h2= trainer.name
@@ -6,11 +6,11 @@
     .pc-boxes
       %ul.party.pc-box
         %h3 Party
-        - trainer.party.each do |p|
+        - party.each do |p|
           %li
             %span.party-icon= image_tag p.icon_path
-            %span.party-name= link_to p.revisions.last.nickname, p
-      - trainer.boxes.each do |box|
+            %span.party-name= link_to p.nickname, p
+      - boxes.each do |box|
         .pc-box
           %h3= box[:name]
           %table.pc-contents
@@ -23,7 +23,7 @@
                     - else
                       = link_to image_tag(p.icon_path), p
                       .pc-data.pkv-hover
-                        .pc-data-name= p.revisions.last.nickname
+                        .pc-data-name= p.nickname
                         .pc-data-ot
                           OT/
                           %span{ class: p.ot_gender }>= p.ot_name
@@ -36,7 +36,7 @@
         %li.pc-pokemon.pkv-has-hover
           = link_to image_tag(p.icon_path), p
           .pc-data.pkv-hover
-            .pc-data-name= p.revisions.last.nickname
+            .pc-data-name= p.nickname
             .pc-data-ot
               OT/
               %span{ class: p.ot_gender }>= p.ot_name