Changeset 293

Timestamp:

12/19/07 14:57:52 (15 years ago)

Author:

ralle030583

Message:

- fix for not showing dropped items when nothing

else was destroyed in killmail

Location:

dev

Files:

• common/includes/globals.php (modified) (1 diff)
• common/kill_detail.php (modified) (5 diffs)
• templates/kill_detail.tpl (modified) (3 diffs)

dev/common/includes/globals.php

@@ -1 +1 @@
 <?php
 // current subversion revision
-preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 292 $', $match);
+preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 293 $', $match);
 define('SVN_REV', $match[1]);
 

dev/common/kill_detail.php

@@ -167 +167 @@
 $smarty->assign('VictimShipImg', $ship->getImage(64));
 
+// preparing slot layout
+
+    $slot_array = array();
+    $slot_array[1] = array('img' => 'icon08_11.png', 'text' => 'Fitted - High slot', 'items' => array());
+    $slot_array[2] = array('img' => 'icon08_10.png', 'text' => 'Fitted - Mid slot', 'items' => array());
+    $slot_array[3] = array('img' => 'icon08_09.png', 'text' => 'Fitted - Low slot', 'items' => array());
+    $slot_array[5] = array('img' => 'icon68_01.png', 'text' => 'Fitted - Rig slot', 'items' => array());
+    $slot_array[6] = array('img' => 'icon02_10.png', 'text' => 'Drone bay', 'items' => array());
+    $slot_array[4] = array('img' => 'icon03_14.png', 'text' => 'Cargo Bay', 'items' => array());
+
 // ship fitting
 if (count($kill->destroyeditems_) > 0)
 {
     $dest_array = array();
-    $dest_array[1] = array('img' => 'icon08_11.png', 'text' => 'Fitted - High slot', 'items' => array());
-    $dest_array[2] = array('img' => 'icon08_10.png', 'text' => 'Fitted - Mid slot', 'items' => array());
-    $dest_array[3] = array('img' => 'icon08_09.png', 'text' => 'Fitted - Low slot', 'items' => array());
-    $dest_array[5] = array('img' => 'icon68_01.png', 'text' => 'Fitted - Rig slot', 'items' => array());
-    $dest_array[6] = array('img' => 'icon02_10.png', 'text' => 'Drone bay', 'items' => array());
-    $dest_array[4] = array('img' => 'icon03_14.png', 'text' => 'Cargo Bay', 'items' => array());
-
     foreach($kill->destroyeditems_ as $destroyed)
     {
@@ -187 +190 @@
             $formatted = $destroyed->getFormatttedValue();
         }
-        $dest_array[$destroyed->getLocationID()]['items'][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $destroyed->getQuantity(), 'Value' => $formatted, 'single_unit' => $value, 'itemID' => $item->getID(),'slotID' => $destroyed->getLocationID());
+        $dest_array[$destroyed->getLocationID()][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $destroyed->getQuantity(), 'Value' => $formatted, 'single_unit' => $value, 'itemID' => $item->getID(),'slotID' => $destroyed->getLocationID());
     }
 }
@@ -194 +197 @@
 {
     $drop_array = array();
-    $drop_array[1] = array('img' => 'icon08_11.png', 'text' => 'Fitted - High slot', 'items' => array());
-    $drop_array[2] = array('img' => 'icon08_10.png', 'text' => 'Fitted - Mid slot', 'items' => array());
-    $drop_array[3] = array('img' => 'icon08_09.png', 'text' => 'Fitted - Low slot', 'items' => array());
-    $drop_array[5] = array('img' => 'icon68_01.png', 'text' => 'Fitted - Rig slot', 'items' => array());
-    $drop_array[6] = array('img' => 'icon02_10.png', 'text' => 'Drone bay', 'items' => array());
-    $drop_array[4] = array('img' => 'icon03_14.png', 'text' => 'Cargo Bay', 'items' => array());
-
     foreach($kill->droppeditems_ as $dropped)
     {
@@ -210 +206 @@
             $formatted = $dropped->getFormatttedValue();
         }
-        $drop_array[$dropped->getLocationID()]['items'][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $dropped->getQuantity(), 'Value' => $formatted, 'single_unit' => $value, 'itemID' => $item->getID(),'slotID' => $dropped->getLocationID());
+        $drop_array[$dropped->getLocationID()][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $dropped->getQuantity(), 'Value' => $formatted, 'single_unit' => $value, 'itemID' => $item->getID(),'slotID' => $dropped->getLocationID());
     }
 }
@@ -229 +225 @@
 $dropvalue = number_format($dropvalue, 2);
 
-
 $smarty->assign_by_ref('destroyed', $dest_array);
 $smarty->assign_by_ref('dropped', $drop_array);
+$smarty->assign_by_ref('slots', $slot_array);
 $smarty->assign('ItemValue', $Formatted);
 $smarty->assign('DropValue', $dropvalue);

dev/templates/kill_detail.tpl

@@ -63 +63 @@
             <div class="block-header">Ship details</div>
             <table class="kb-table" width="360" border="0" cellspacing="1">
-{foreach from=$destroyed item=slot key=slotindex}
+{foreach from=$slots item=slot key=slotindex}
 {* set to true to show empty slots *}
-{if $slot.items or $dropped.$slotindex.items}
+{if $destroyed.$slotindex or $dropped.$slotindex}
                 <tr class="kb-table-row-even">
                     <td class="item-icon" width="32"><img width="32" height="32" src="{$img_url}/{$slot.img}" alt="{$slot.text}" border="0"></td>
@@ -73 +73 @@
     {/if}
                 </tr>
-    {foreach from=$slot.items item=i}
+    {foreach from=$destroyed.$slotindex item=i}
                 <tr class="kb-table-row-odd">
                     <td class="item-icon" width="32" height="34" valign="top"><a href="?a=invtype&id={$i.itemID}">{$i.Icon}</a></td>
@@ -111 +111 @@
                     </tr>
         {/if}
-    {foreachelse}
-                <tr class="kb-table-row-odd">
-                    <td colspan="4" valign="top">No Items lost</td>
-                </tr>
     {/foreach}
-    {foreach from=$dropped.$slotindex.items item=i}
+    {foreach from=$dropped.$slotindex item=i}
                 <tr class="kb-table-row-odd" style="background-color: green;">
                     <td style="border: 1px solid green;" width="32" height="34" valign="top"><a href="?a=invtype&id={$i.itemID}">{$i.Icon}</a></td>