From 43e64a5f8cda7b91ad0be254780f38fc3f7fcf28 Mon Sep 17 00:00:00 2001
From: Daniel Meltzer <parallelgrapefruit@gmail.com>
Date: Wed, 22 Jun 2016 15:13:01 -0400
Subject: [PATCH] Store a list of errors associated with each field instead of
 overwriting the error if multiple occur.  Also Adjust the importer to extract
 the asset tag earlier in the process so all asset related errors are
 associated with the asset tag rather than some being tied to the name.

---
 app/Console/Commands/ObjectImportCommand.php | 21 ++++++++++----------
 resources/views/hardware/import.blade.php    | 16 ++++++++-------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/app/Console/Commands/ObjectImportCommand.php b/app/Console/Commands/ObjectImportCommand.php
index 25fceee72d..06360fa8f6 100644
--- a/app/Console/Commands/ObjectImportCommand.php
+++ b/app/Console/Commands/ObjectImportCommand.php
@@ -139,10 +139,13 @@ class ObjectImportCommand extends Command {
 			$item["notes"] = $this->array_smart_fetch($row, "notes");
 			$item["quantity"] = $this->array_smart_fetch($row, "quantity");
 			$item["requestable"] = $this->array_smart_fetch($row, "requestable");
-			
+			$item["asset_tag"] = $this->array_smart_fetch($row, "asset tag");
 
 
 			$this->current_assetId = $item["item_name"];
+                        if($item["asset_tag"] != '') {
+                            $this->current_assetId = $item["asset_tag"];
+                        }
 			$this->log('Category: ' . $item_category);
 			$this->log('Location: ' . $item_location);
 			$this->log('Purchase Date: ' . $item["purchase_date"]);
@@ -226,9 +229,9 @@ class ObjectImportCommand extends Command {
 
 	public function jsonError($field, $errorString)
 	{
-		$this->errors[$this->current_assetId] = array($field => $errorString);
+		$this->errors[$this->current_assetId][$field] = $errorString;
 		if($this->option('verbose'))
-			parent::error($errorString);
+			parent::error($field . $errorString);
 	}
 
 	/**
@@ -712,7 +715,6 @@ class ObjectImportCommand extends Command {
 	public function createAssetIfNotExists(array $row, array $item )
 	{
         $asset_serial = $this->array_smart_fetch($row, "serial number");
-        $asset_tag = $this->array_smart_fetch($row, "asset tag");
         $asset_image = $this->array_smart_fetch($row, "image");
         $asset_warranty_months = intval($this->array_smart_fetch($row, "warranty months"));
         if(empty($asset_warranty_months)) {
@@ -722,17 +724,14 @@ class ObjectImportCommand extends Command {
         $asset_model = $this->createOrFetchAssetModel($row, $item["category"], $item["manufacturer"]);
 		$supplier = $this->createOrFetchSupplier($row);
 
-		$this->current_assetId = $asset_tag;
-
         $this->log('Serial No: '.$asset_serial);
-        $this->log('Asset Tag: '.$asset_tag);
+        $this->log('Asset Tag: '.$item['asset_tag']);
         $this->log('Notes: '.$item["notes"]);
         $this->log('Warranty Months: ' . $asset_warranty_months);
 
 		foreach ($this->assets as $tempasset) {
-			if (strcasecmp($tempasset->asset_tag, $asset_tag ) == 0 ) {
-				$this->log('A matching Asset ' . $asset_tag . ' already exists');
-				// $this->comment('A matching Asset ' . $asset_tag . ' already exists');
+			if (strcasecmp($tempasset->asset_tag, $item['asset_tag'] ) == 0 ) {
+				$this->log('A matching Asset ' . $item['asset_tag'] . ' already exists');
 				return;
 			}
 		}
@@ -769,7 +768,7 @@ class ObjectImportCommand extends Command {
 			$asset->purchase_cost = 0.00;
 		}
 		$asset->serial = $asset_serial;
-		$asset->asset_tag = $asset_tag;
+		$asset->asset_tag = $item['asset_tag'];
                 $asset->warranty_months = $asset_warranty_months;
 
 		if($asset_model)
diff --git a/resources/views/hardware/import.blade.php b/resources/views/hardware/import.blade.php
index 0ad8556c0d..9beab7c995 100644
--- a/resources/views/hardware/import.blade.php
+++ b/resources/views/hardware/import.blade.php
@@ -79,16 +79,18 @@
                 <th>Errors</th>
             </thead>
             <tbody>
-                @foreach (session('import_errors') as $asset => $error)
+                @foreach (session('import_errors') as $asset => $itemErrors)
                 <tr>
                     <td> {{ $asset }}</td>
-                    @foreach ($error as $field => $values )
-                        <td> <span><b>{{ $field }}:</b>
-                            @foreach( $values as $errorString)
-                                    <span>{{$errorString[0]}} </span>
-                            @endforeach
-                        </td>
+                    <td>
+                    @foreach ($itemErrors as $field => $values )
+                            <b>{{ $field }}:</b>
+                              @foreach( $values as $errorString)
+                                      <span>{{$errorString[0]}} </span>
+                              @endforeach
+                              <br />
                     @endforeach
+                    </td>
                 </tr>
                 @endforeach
             </tbody>