From 17b3c3ab34035c57b8594d7f674c5d9ac0a843fb Mon Sep 17 00:00:00 2001
From: nsensfel <SpamShield0@noot-noot.org>
Date: Wed, 9 Jan 2019 18:44:03 +0100
Subject: Adapts Battle & Maps summaries to match server.

---
 src/main-menu/src/Struct/BattleSummary.elm |  3 +++
 src/main-menu/src/Struct/MapSummary.elm    |  5 ++++-
 src/main-menu/src/Struct/Player.elm        | 24 ++++++++++++------------
 src/main-menu/src/View/CurrentTab.elm      | 10 +++++++---
 4 files changed, 26 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/main-menu/src/Struct/BattleSummary.elm b/src/main-menu/src/Struct/BattleSummary.elm
index 8eb8d6f..3670879 100644
--- a/src/main-menu/src/Struct/BattleSummary.elm
+++ b/src/main-menu/src/Struct/BattleSummary.elm
@@ -28,6 +28,7 @@ type InvasionCategory =
 
 type alias Type =
    {
+      ix : Int,
       id : String,
       name : String,
       last_edit : String,
@@ -68,6 +69,7 @@ decoder : (Json.Decode.Decoder Type)
 decoder =
    (Json.Decode.succeed
       Type
+      |> (Json.Decode.Pipeline.required "ix" Json.Decode.int)
       |> (Json.Decode.Pipeline.required "id" Json.Decode.string)
       |> (Json.Decode.Pipeline.required "nme" Json.Decode.string)
       |> (Json.Decode.Pipeline.required "ldt" Json.Decode.string)
@@ -77,6 +79,7 @@ decoder =
 none : Type
 none =
    {
+      ix = -1,
       id = "",
       name = "Unknown",
       last_edit = "Never",
diff --git a/src/main-menu/src/Struct/MapSummary.elm b/src/main-menu/src/Struct/MapSummary.elm
index e6e8120..396afc5 100644
--- a/src/main-menu/src/Struct/MapSummary.elm
+++ b/src/main-menu/src/Struct/MapSummary.elm
@@ -18,6 +18,7 @@ import Json.Decode.Pipeline
 --------------------------------------------------------------------------------
 type alias Type =
    {
+      ix : Int,
       id : String,
       name : String
    }
@@ -38,7 +39,8 @@ get_name t = t.name
 decoder : (Json.Decode.Decoder Type)
 decoder =
    (Json.Decode.succeed
-      Type
+     Type
+      |> (Json.Decode.Pipeline.required "ix" Json.Decode.int)
       |> (Json.Decode.Pipeline.required "id" Json.Decode.string)
       |> (Json.Decode.Pipeline.required "nme" Json.Decode.string)
    )
@@ -46,6 +48,7 @@ decoder =
 none : Type
 none =
    {
+      ix = -1,
       id = "",
       name = "Unknown"
    }
diff --git a/src/main-menu/src/Struct/Player.elm b/src/main-menu/src/Struct/Player.elm
index 44d335a..e5bd8f7 100644
--- a/src/main-menu/src/Struct/Player.elm
+++ b/src/main-menu/src/Struct/Player.elm
@@ -30,10 +30,10 @@ type alias Type =
    {
       id : String,
       name : String,
-      maps : (List Struct.MapSummary.Type),
-      campaigns : (List Struct.BattleSummary.Type),
+      maps : (Array.Array Struct.MapSummary.Type),
+      campaigns : (Array.Array Struct.BattleSummary.Type),
       invasions : (Array.Array Struct.BattleSummary.Type),
-      events : (List Struct.BattleSummary.Type),
+      events : (Array.Array Struct.BattleSummary.Type),
       roster_id : String,
       inventory_id : String
    }
@@ -51,16 +51,16 @@ get_id t = t.id
 get_username : Type -> String
 get_username t = t.name
 
-get_maps : Type -> (List Struct.MapSummary.Type)
+get_maps : Type -> (Array.Array Struct.MapSummary.Type)
 get_maps t = t.maps
 
-get_campaigns : Type -> (List Struct.BattleSummary.Type)
+get_campaigns : Type -> (Array.Array Struct.BattleSummary.Type)
 get_campaigns t = t.campaigns
 
 get_invasions : Type -> (Array.Array Struct.BattleSummary.Type)
 get_invasions t = t.invasions
 
-get_events : Type -> (List Struct.BattleSummary.Type)
+get_events : Type -> (Array.Array Struct.BattleSummary.Type)
 get_events t = t.events
 
 get_roster_id : Type -> String
@@ -77,11 +77,11 @@ decoder =
       |> (Json.Decode.Pipeline.required "nme" Json.Decode.string)
       |> (Json.Decode.Pipeline.required
             "maps"
-            (Json.Decode.list Struct.MapSummary.decoder)
+            (Json.Decode.array Struct.MapSummary.decoder)
          )
       |> (Json.Decode.Pipeline.required
             "cmps"
-            (Json.Decode.list Struct.BattleSummary.decoder)
+            (Json.Decode.array Struct.BattleSummary.decoder)
          )
       |> (Json.Decode.Pipeline.required
             "invs"
@@ -89,7 +89,7 @@ decoder =
          )
       |> (Json.Decode.Pipeline.required
             "evts"
-            (Json.Decode.list Struct.BattleSummary.decoder)
+            (Json.Decode.array Struct.BattleSummary.decoder)
          )
       |> (Json.Decode.Pipeline.required "rtid" Json.Decode.string)
       |> (Json.Decode.Pipeline.required "ivid" Json.Decode.string)
@@ -100,10 +100,10 @@ none =
    {
       id = "",
       name = "Unknown",
-      maps = [],
-      campaigns = [],
+      maps = (Array.empty),
+      campaigns = (Array.empty),
       invasions = (Array.empty),
-      events = [],
+      events = (Array.empty),
       roster_id = "",
       inventory_id = ""
    }
diff --git a/src/main-menu/src/View/CurrentTab.elm b/src/main-menu/src/View/CurrentTab.elm
index e558b15..3a5f711 100644
--- a/src/main-menu/src/View/CurrentTab.elm
+++ b/src/main-menu/src/View/CurrentTab.elm
@@ -1,6 +1,8 @@
 module View.CurrentTab exposing (get_html)
 
 -- Elm -------------------------------------------------------------------------
+import Array
+
 import Html
 --import Html.Attributes
 
@@ -29,7 +31,7 @@ default_tab model =
          (View.BattleListing.get_html
             "Campaigns"
             "main-menu-campaigns"
-            (Struct.Player.get_campaigns model.player)
+            (Array.toList (Struct.Player.get_campaigns model.player))
          ),
          (View.Invasions.get_html
             (Struct.Player.get_invasions model.player)
@@ -37,9 +39,11 @@ default_tab model =
          (View.BattleListing.get_html
             "Events"
             "main-menu-events"
-            (Struct.Player.get_events model.player)
+            (Array.toList (Struct.Player.get_events model.player))
+         ),
+         (View.MapListing.get_html
+            (Array.toList (Struct.Player.get_maps model.player))
          ),
-         (View.MapListing.get_html (Struct.Player.get_maps model.player)),
          (View.Roster.get_html)
       ]
    )
-- 
cgit v1.2.3-70-g09d2