X-Git-Url: https://git.xangelo.ca/?a=blobdiff_plain;f=src%2Frender%2Funit-training.ts;h=a1bd4b8756bef6a275f1c07b9609229bf510ce90;hb=9cb3a0584377f61cf3382fef4541246d1b1202bc;hp=a177dec3cbec67caf3a1a7d64a99d425ab085f56;hpb=ed54ffb9b589bd35842561fd6cd13779e836b8eb;p=browser-rts.git

diff --git a/src/render/unit-training.ts b/src/render/unit-training.ts
index a177dec..a1bd4b8 100644
--- a/src/render/unit-training.ts
+++ b/src/render/unit-training.ts
@@ -4,6 +4,16 @@ import { UnitTrainingQueueWithName } from "../repository/training-queue";
 import { Unit } from "../repository/unit";
 import { DateTime } from "luxon";
 
+const emptyQueue: UnitTrainingQueueWithName = {
+  display: '',
+  id: '',
+  owner: '',
+  amount: 0,
+  created: 0,
+  due: 0,
+  unit_type: 'empty'
+}
+
 function progressBar(current: number, max: number): string {
     const percent = Math.ceil((current/max) * 100);
     return `
@@ -16,6 +26,9 @@ function progressBar(current: number, max: number): string {
 
 export function renderUnitTraining(city: CityWithLocation, units: Unit[], trainingQueues: UnitTrainingQueueWithName[]): string {
     const unit = _.keyBy(units, 'slug');
+    const sortedTrainingQueue = trainingQueues.sort((a, b) => {
+        return a.due - b.due;
+    });
     let html = `
     <div hx-trigger="reload-unit-training, every 600s" hx-get="/poll/unit-training">
     <h2 data-augmented-ui="tl-clip bl-clip none">Unit Training</h2>
@@ -30,8 +43,8 @@ export function renderUnitTraining(city: CityWithLocation, units: Unit[], traini
         <th>Soldiers</th>
         <td>${city.soldiers}</td>
         <td>
-            <form hx-post="/units">
-                <input type="number" name="amount" size="6" max="${city.population}" hx-trigger="keyup" hx-post="/cost/training" hx-target="#${unit.soldiers.slug}-cost">
+            <form hx-post="/units" hx-swap="innerHTML" hx-target="#notifications">
+                <input type="number" name="amount" size="6" max="${city.population}" hx-trigger="keyup" hx-post="/cost/training" hx-target="#${unit.soldiers.slug}-cost" hx-swap="innerHTML">
                 <input type="hidden" name="type" value="${unit.soldiers.slug}">
                 <button type="submit" ${city.population ? '' : 'disabled'}>Train</button>
             </form>
@@ -42,8 +55,8 @@ export function renderUnitTraining(city: CityWithLocation, units: Unit[], traini
         <th>Attackers</th>
         <td>${city.attackers}</td>
         <td>
-            <form hx-post="/units">
-                <input type="number" name="amount" size="6" max="${city.soldiers}" hx-trigger="keyup" hx-post="/cost/training" hx-target="#${unit.attackers.slug}-cost">
+            <form hx-post="/units" hx-swap="innerHTML" hx-target="#notifications">
+                <input type="number" name="amount" size="6" max="${city.soldiers}" hx-trigger="keyup" hx-post="/cost/training" hx-target="#${unit.attackers.slug}-cost" hx-swap="innerHTML">
                 <input type="hidden" name="type" value="${unit.attackers.slug}">
                 <button type="submit" ${city.soldiers ? '' : 'disabled'}>Train</button>
             </form>
@@ -54,8 +67,8 @@ export function renderUnitTraining(city: CityWithLocation, units: Unit[], traini
         <th>Defenders</th>
         <td>${city.defenders}</td>
         <td>
-            <form hx-post="/units">
-                <input type="number" name="amount" size="6" max="${city.soldiers}" hx-trigger="keyup" hx-post="/cost/training" hx-target="#${unit.defenders.slug}-cost">
+            <form hx-post="/units" hx-swap="innerHTML" hx-target="#notifications">
+                <input type="number" name="amount" size="6" max="${city.soldiers}" hx-trigger="keyup" hx-post="/cost/training" hx-target="#${unit.defenders.slug}-cost" hx-swap="innerHTML">
                 <input type="hidden" name="type" value="${unit.defenders.slug}">
                 <button type="submit" ${city.soldiers ? '' : 'disabled'}>Train</button>
             </form>
@@ -66,8 +79,8 @@ export function renderUnitTraining(city: CityWithLocation, units: Unit[], traini
         <th>Special Attackers</th>
         <td>${city.sp_attackers}</td>
         <td>
-            <form hx-post="/units">
-                <input type="number" name="amount" size="6" max="${city.attackers}" hx-trigger="keyup" hx-post="/cost/training" hx-target="#${unit.sp_attackers.slug}-cost">
+            <form hx-post="/units" hx-swap="innerHTML" hx-target="#notifications">
+                <input type="number" name="amount" size="6" max="${city.attackers}" hx-trigger="keyup" hx-post="/cost/training" hx-target="#${unit.sp_attackers.slug}-cost" hx-swap="innerHTML">
                 <input type="hidden" name="type" value="${unit.sp_attackers.slug}">
                 <button type="submit" ${city.attackers ? '': 'disabled'}>Train</button>
             </form>
@@ -79,8 +92,8 @@ export function renderUnitTraining(city: CityWithLocation, units: Unit[], traini
         <th>Special Defenders</th>
         <td>${city.sp_defenders}</td>
         <td>
-            <form hx-post="/units">
-                <input type="number" name="amount" size="6" max="${city.defenders}" hx-trigger="keyup" hx-post="/cost/training" hx-target="#${unit.sp_defenders.slug}-cost">
+            <form hx-post="/units" hx-swap="innerHTML" hx-target="#notifications">
+                <input type="number" name="amount" size="6" max="${city.defenders}" hx-trigger="keyup" hx-post="/cost/training" hx-target="#${unit.sp_defenders.slug}-cost" hx-swap="innerHTML">
                 <input type="hidden" name="type" value="${unit.sp_defenders.slug}">
                 <button type="submit" ${city.defenders ? '': 'disabled'}>Train</button>
             </form>
@@ -90,34 +103,46 @@ export function renderUnitTraining(city: CityWithLocation, units: Unit[], traini
     </table>
     `;
 
+    const finalTrainingQueue = sortedTrainingQueue;
+    if(finalTrainingQueue.length < city.max_training_queue) {
+      while(finalTrainingQueue.length < city.max_construction_queue) {
+        finalTrainingQueue.push(emptyQueue);
+      }
+    }
+
     const queues = `
     <hr>
     <h2 data-augmented-ui="tl-clip bl-clip none">Training Queues</h2>
     <table>
     <tr>
-    <th>Unit Type</th>
-    <th>Amount Expected</th>
+    <th align="left">Unit Type</th>
+    <th align="left">Amount Expected</th>
     <th>Progress</th>
     </tr>
-    ${trainingQueues.sort((a, b) => {
-        return a.due - b.due;
-    }).map(queue => {
-      const created = DateTime.fromMillis(queue.created);
-      const due = DateTime.fromMillis(queue.due);
-      const now = Date.now() - queue.created;
-      const duration = queue.due - queue.created;
+    ${sortedTrainingQueue.map(queue => {
+      if(queue.unit_type === 'empty') {
+        return `<tr>
+        <td colspan="4">You have sufficient queue capacity to train more units.</td>
+        </tr>`;
+      }
+      else {
+        const created = DateTime.fromMillis(queue.created);
+        const due = DateTime.fromMillis(queue.due);
+        const now = Date.now() - queue.created;
+        const duration = queue.due - queue.created;
 
-      return `
-      <tr>
-      <td>${queue.display}</td>
-      <td>${queue.amount}</td>
-      <td>
-      <span title="${Math.ceil(due.diff(created).as('minutes')).toLocaleString()} minutes remaining">
-      ${progressBar(now, duration)}<br>
-      </span>
-      </td>
-      </tr>
-      `;
+        return `
+        <tr>
+        <td>${queue.display}</td>
+        <td>${queue.amount}</td>
+        <td>
+        <span title="${Math.ceil(due.diff(created).as('minutes')).toLocaleString()} minutes remaining">
+        ${progressBar(now, duration)}<br>
+        </span>
+        </td>
+        </tr>
+        `;
+      }
     }).join("\n")}
     </table>
     </div>