From 8d5907e0d8af6d309ccd98dd2118cd2cd6471ec1 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sun, 4 Feb 2018 19:29:36 +0800
Subject: [PATCH 1/6] Update hub list display to show branch name on outlet
 form

---
 templates/outlet/form.html.twig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/outlet/form.html.twig b/templates/outlet/form.html.twig
index 73ce5f8c..e1df7a3f 100644
--- a/templates/outlet/form.html.twig
+++ b/templates/outlet/form.html.twig
@@ -24,7 +24,7 @@
                             <h3 class="m-portlet__head-text">
                                 {% if mode == 'update' %}
                                     Edit Outlet
-                                    <small>{{ obj.getName() }}</small>
+                                    <small>{{ obj.getName }}</small>
                                 {% else %}
                                     New Outlet
                                 {% endif %}
@@ -32,7 +32,7 @@
                         </div>
                     </div>
                 </div>
-                <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('outlet_update_submit', {'id': obj.getId()}) : url('outlet_create_submit') }}">
+                <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('outlet_update_submit', {'id': obj.getID}) : url('outlet_create_submit') }}">
 
                     <div class="m-portlet__body">
                         <div class="form-group m-form__group row no-border">
@@ -40,14 +40,14 @@
                                 <label for="name" data-field="name">
                                     Name
                                 </label>
-                                <input type="text" name="name" class="form-control m-input" value="{{ obj.getName() }}">
+                                <input type="text" name="name" class="form-control m-input" value="{{ obj.getName }}">
                                 <div class="form-control-feedback hide" data-field="name"></div>
                             </div>
                             <div class="col-lg-6">
                                 <label for="branch" data-field="branch">
                                     Branch
                                 </label>
-                                <input type="text" name="branch" class="form-control m-input" value="{{ obj.getBranch() }}">
+                                <input type="text" name="branch" class="form-control m-input" value="{{ obj.getBranch }}">
                                 <div class="form-control-feedback hide" data-field="branch"></div>
                             </div>
                         </div>
@@ -98,7 +98,7 @@
                                 <select class="form-control m-input" id="hub" name="hub">
                                     <option value=""></option>
                                     {% for hub in hubs %}
-                                        <option value="{{ hub.getID() }}"{{ obj.getHub() and hub.getID() == obj.getHub().getID() ? ' selected' }}>{{ hub.getName() }}</option>
+                                        <option value="{{ hub.getID }}"{{ obj.getHub and hub.getID == obj.getHub.getID ? ' selected' }}>{{ hub.getName ~ (hub.getBranch ? ' - ' ~ hub.getBranch) }}</option>
                                     {% endfor %}
                                 </select>
                                 <div class="form-control-feedback hide" data-field="hub"></div>

From 2e1573feac2b24bd43425bea2c986b74ed5c8e4b Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sun, 4 Feb 2018 19:47:02 +0800
Subject: [PATCH 2/6] Update rider form hub list display + reposition plate
 number field

---
 templates/rider/form.html.twig | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/rider/form.html.twig b/templates/rider/form.html.twig
index def5e92c..7e40a6c5 100644
--- a/templates/rider/form.html.twig
+++ b/templates/rider/form.html.twig
@@ -53,23 +53,23 @@
 									<div class="form-control-feedback hide" data-field="contact_no"></div>
 								</div>
 								<div class="col-lg-6">
+									<label data-field="plate_number">Plate Number</label>
+									<input type="text" name="plate_number" class="form-control m-input" value="{{ obj.getPlateNumber() }}">
+									<div class="form-control-feedback hide" data-field="plate_number"></div>
+								</div>
+							</div>
+							<div class="form-group m-form__group row no-border">
+								<div class="col-lg-12">
 									<label data-field="hub">Hub</label>
 									<select class="form-control m-input" id="hub" name="hub">
 										<option value=""></option>
 										{% for hub in hubs %}
-											<option value="{{ hub.getID() }}"{{ obj.getHub() and hub.getID() == obj.getHub().getID() ? ' selected' }}>{{ hub.getName() }}</option>
-										{% endfor %}
+	                                        <option value="{{ hub.getID }}"{{ obj.getHub and hub.getID == obj.getHub.getID ? ' selected' }}>{{ hub.getName ~ (hub.getBranch ? ' - ' ~ hub.getBranch) }}</option>
+	                                    {% endfor %}
 									</select>
 									<div class="form-control-feedback hide" data-field="hub"></div>
 								</div>
 							</div>
-							<div class="form-group m-form__group row no-border">
-								<div class="col-lg-6">
-									<label data-field="plate_number">Plate Number</label>
-									<input type="text" name="plate_number" class="form-control m-input" value="{{ obj.getPlateNumber() }}">
-									<div class="form-control-feedback hide" data-field="plate_number"></div>
-								</div>
-							</div>
 							<div class="form-group m-form__group row">
 								<div class="col-lg-6">
 									<label data-field="image_file">

From 95092c2c1b49b7b8c2c70555d8d59ddc015338e7 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sun, 4 Feb 2018 19:48:11 +0800
Subject: [PATCH 3/6] Add space between vehicle model and year in form title

---
 templates/vehicle/form.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/vehicle/form.html.twig b/templates/vehicle/form.html.twig
index 970065e5..b3af8132 100644
--- a/templates/vehicle/form.html.twig
+++ b/templates/vehicle/form.html.twig
@@ -24,7 +24,7 @@
 								<h3 class="m-portlet__head-text">
 									{% if mode == 'update' %}
 										Edit Vehicle
-										<small>{{ obj.getManufacturer().getName() ~ ' ' ~ obj.getMake() ~ obj.getModelYearFrom() ~ '-' ~ obj.getModelYearTo() }}</small>
+										<small>{{ obj.getManufacturer().getName() ~ ' ' ~ obj.getMake() ~ ' ' ~ obj.getModelYearFrom() ~ '-' ~ obj.getModelYearTo() }}</small>
 									{% else %}
 										New Vehicle
 									{% endif %}

From 74b696099c0e5b3b4fc6da4ca3f77ebcd28ac36e Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sun, 4 Feb 2018 20:37:04 +0800
Subject: [PATCH 4/6] Check if filename exists before proceeding with upload

---
 src/Service/FileUploader.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Service/FileUploader.php b/src/Service/FileUploader.php
index c33fb672..d202ee68 100644
--- a/src/Service/FileUploader.php
+++ b/src/Service/FileUploader.php
@@ -15,7 +15,11 @@ class FileUploader
 
     public function upload(UploadedFile $file)
     {
-        $filename = md5(uniqid()) . '.' . $file->guessExtension();
+        do 
+        {
+            $filename = md5(uniqid()) . '.' . $file->guessExtension();
+        }
+        while(file_exists($this->getTargetDir() . '/' . $filename));
 
         $file->move($this->getTargetDir(), $filename);
 

From 884cd7b7f10d8eed2d5885233ce1c45920b61022 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sun, 4 Feb 2018 23:10:32 +0800
Subject: [PATCH 5/6] Add image file to battery, update cleanup task for
 orphaned images

---
 config/routes/battery.yaml           |   5 ++
 public/assets/images/battery.gif     | Bin 0 -> 4993 bytes
 src/Command/UploadCleanupCommand.php |  23 +++++--
 src/Controller/BatteryController.php |  21 +++++-
 src/Controller/RiderController.php   |   2 +-
 src/Entity/Battery.php               |  16 +++++
 templates/battery/form.html.twig     |  99 +++++++++++++++++++++------
 templates/battery/list.html.twig     |  11 +++
 templates/rider/form.html.twig       |   4 +-
 9 files changed, 152 insertions(+), 29 deletions(-)
 create mode 100644 public/assets/images/battery.gif

diff --git a/config/routes/battery.yaml b/config/routes/battery.yaml
index 7fa4c9e2..04a9d952 100644
--- a/config/routes/battery.yaml
+++ b/config/routes/battery.yaml
@@ -9,6 +9,11 @@ battery_rows:
     controller: App\Controller\BatteryController::rows
     methods: [POST]
 
+battery_upload_image:
+    path: /batteries/upload
+    controller: App\Controller\BatteryController::uploadImage
+    methods: [POST]
+
 battery_create:
     path: /batteries/create
     controller: App\Controller\BatteryController::addForm
diff --git a/public/assets/images/battery.gif b/public/assets/images/battery.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c8bc9b96cdb9e67df5086fdd4de2e7d405de919b
GIT binary patch
literal 4993
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

literal 0
HcmV?d00001

diff --git a/src/Command/UploadCleanupCommand.php b/src/Command/UploadCleanupCommand.php
index 36de2bd4..94d22c6e 100644
--- a/src/Command/UploadCleanupCommand.php
+++ b/src/Command/UploadCleanupCommand.php
@@ -10,6 +10,7 @@ use Symfony\Component\Filesystem\Exception\IOExceptionInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 
 use App\Entity\Rider;
+use App\Entity\Battery;
 use App\Service\FileUploader;
 
 use DirectoryIterator;
@@ -41,12 +42,26 @@ class UploadCleanupCommand extends Command
 
         // get all image filenames
         $em = $this->object_manager;
-        $rows = $em->getRepository(Rider::class)->findAll();
+
+        $riders = $em->getRepository(Rider::class)->findAll();
         $whitelist = ['.gitkeep'];
 
-        if (!empty($rows)) {
-            foreach ($rows as $row) {
-                $image = $row->getImageFile();
+        if (!empty($riders)) {
+            foreach ($riders as $obj) {
+                $image = $obj->getImageFile();
+
+                if (!empty($image)) {
+                    $whitelist[] = $image;
+                }
+            }
+        }
+
+        $batteries = $em->getRepository(Battery::class)->findAll();
+        $whitelist = ['.gitkeep'];
+
+        if (!empty($batteries)) {
+            foreach ($batteries as $obj) {
+                $image = $obj->getImageFile();
 
                 if (!empty($image)) {
                     $whitelist[] = $image;
diff --git a/src/Controller/BatteryController.php b/src/Controller/BatteryController.php
index 238738f7..990f34fa 100644
--- a/src/Controller/BatteryController.php
+++ b/src/Controller/BatteryController.php
@@ -9,6 +9,7 @@ use App\Entity\BatteryModel;
 use App\Entity\BatterySize;
 use App\Entity\Vehicle;
 use App\Entity\VehicleManufacturer;
+use App\Service\FileUploader;
 
 use Doctrine\ORM\Query;
 use Symfony\Component\HttpFoundation\Request;
@@ -123,6 +124,7 @@ class BatteryController extends BaseController
             $row['width'] = $orow[0]->getWidth();
             $row['height'] = $orow[0]->getHeight();
             $row['total_height'] = $orow[0]->getTotalHeight();
+            $row['image_file'] = $orow[0]->getImageFile();
 
             // add row metadata
             $row['meta'] = [
@@ -183,7 +185,8 @@ class BatteryController extends BaseController
             ->setWidth($req->request->get('width'))
             ->setHeight($req->request->get('height'))
             ->setTotalHeight($req->request->get('total_height'))
-            ->setSellingPrice($req->request->get('sell_price'));
+            ->setSellingPrice($req->request->get('sell_price'))
+            ->setImageFile($req->request->get('image_file'));
 
         // initialize error list
         $error_array = [];
@@ -304,6 +307,7 @@ class BatteryController extends BaseController
             ->setHeight($req->request->get('height'))
             ->setTotalHeight($req->request->get('total_height'))
             ->setSellingPrice($req->request->get('sell_price'))
+            ->setImageFile($req->request->get('image_file'))
             ->clearVehicles();
 
         // initialize error list
@@ -398,6 +402,21 @@ class BatteryController extends BaseController
         $response->send();
     }
 
+    public function uploadImage(Request $req, FileUploader $uploader)
+    {
+        // retrieve temporary info for file
+        $file = $req->files->get('image_file');
+
+        // upload the file
+        $filename = $uploader->upload($file);
+
+        // return response
+        return $this->json([
+            'success' => true,
+            'filename' => $filename
+        ]);
+    }
+
     // check if datatable filter is present and append to query
     protected function setQueryFilters($datatable, &$query) {
         if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
diff --git a/src/Controller/RiderController.php b/src/Controller/RiderController.php
index 0f6dae90..58925058 100644
--- a/src/Controller/RiderController.php
+++ b/src/Controller/RiderController.php
@@ -197,7 +197,7 @@ class RiderController extends BaseController
         }  
     }
 
-    public function updateForm(FileUploader $uploader, $id)
+    public function updateForm($id)
     {
         $this->denyAccessUnlessGranted('rider.update', null, 'No access.');
 
diff --git a/src/Entity/Battery.php b/src/Entity/Battery.php
index 07d9d33c..e7616b89 100644
--- a/src/Entity/Battery.php
+++ b/src/Entity/Battery.php
@@ -123,6 +123,11 @@ class Battery
      */
     protected $sell_price;
 
+    /**
+     * @ORM\Column(type="string", nullable=true)
+     */
+    protected $image_file;
+
     public function __construct()
     {
         $this->vehicles = new ArrayCollection();
@@ -299,4 +304,15 @@ class Battery
     {
         return $this->cust_vehicles;
     }
+
+    public function setImageFile($image_file)
+    {
+        $this->image_file = $image_file;
+        return $this;
+    }
+
+    public function getImageFile()
+    {
+        return $this->image_file;
+    }
 }
diff --git a/templates/battery/form.html.twig b/templates/battery/form.html.twig
index f7dfe2ca..73b6844a 100644
--- a/templates/battery/form.html.twig
+++ b/templates/battery/form.html.twig
@@ -24,7 +24,7 @@
 								<h3 class="m-portlet__head-text">
 									{% if mode == 'update' %}
 										Edit Battery
-										<small>{{ obj.getProductCode() }}</small>
+										<small>{{ obj.getProductCode }}</small>
 									{% else %}
 										New Battery
 									{% endif %}
@@ -32,7 +32,7 @@
 							</div>
 						</div>
 					</div>
-                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right" method="post" action="{{ mode == 'update' ? url('battery_update_submit', {'id': obj.getId()}) : url('battery_create_submit') }}">
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right" method="post" action="{{ mode == 'update' ? url('battery_update_submit', {'id': obj.getID }) : url('battery_create_submit') }}">
 						<div class="m-portlet__body">	
 							<div class="m-form__section m-form__section--first">
 								<div class="m-form__heading">
@@ -45,14 +45,14 @@
                                         <label data-field="prod_code">
                                             Product Code
                                         </label>
-                                        <input type="text" name="prod_code" class="form-control m-input" value="{{ obj.getProductCode() }}">
+                                        <input type="text" name="prod_code" class="form-control m-input" value="{{ obj.getProductCode }}">
                                         <div class="form-control-feedback hide" data-field="prod_code"></div>
                                     </div>
                                     <div class="col-lg-4">
                                         <label data-field="sell_price">
                                             Selling Price
                                         </label>
-                                        <input type="text" name="sell_price" class="form-control m-input" value="{{ obj.getSellingPrice() }}">
+                                        <input type="text" name="sell_price" class="form-control m-input" value="{{ obj.getSellingPrice }}">
                                         <div class="form-control-feedback hide" data-field="sell_price"></div>
                                     </div>
 								</div>
@@ -64,7 +64,7 @@
                                         <select class="form-control m-input" id="manufacturer" name="manufacturer">
                                             <option value=""></option>
                                             {% for manufacturer in bmfgs %}
-                                                <option value="{{ manufacturer.getID() }}"{{ obj.getManufacturer() and manufacturer.getID() == obj.getManufacturer().getID() ? ' selected' }}>{{ manufacturer.getName() }}</option>
+                                                <option value="{{ manufacturer.getID }}"{{ obj.getManufacturer and manufacturer.getID == obj.getManufacturer.getID ? ' selected' }}>{{ manufacturer.getName }}</option>
                                             {% endfor %}
                                         </select>
                                         <div class="form-control-feedback hide" data-field="manufacturer"></div>
@@ -76,7 +76,7 @@
 										<select class="form-control m-input" id="model" name="model">
 											<option value=""></option>
 											{% for model in models %}
-												<option value="{{ model.getID() }}"{{ obj.getModel() and obj.getModel().getID() ? ' selected' }}>{{ model.getName() }}</option>
+												<option value="{{ model.getID }}"{{ obj.getModel and obj.getModel.getID ? ' selected' }}>{{ model.getName }}</option>
 											{% endfor %}
 										</select>
 										<div class="form-control-feedback hide" data-field="model"></div>
@@ -88,12 +88,43 @@
 										<select class="form-control m-input" id="size" name="size">
 											<option value=""></option>
 											{% for size in sizes %}
-												<option value="{{ size.getID() }}"{{ obj.getSize() and obj.getSize().getID() ? ' selected' }}>{{ size.getName() }}</option>
+												<option value="{{ size.getID }}"{{ obj.getSize and obj.getSize.getID ? ' selected' }}>{{ size.getName }}</option>
 											{% endfor %}
 										</select>
 										<div class="form-control-feedback hide" data-field="size"></div>
 									</div>
 								</div>
+								<div class="form-group m-form__group row">
+									<div class="col-lg-6">
+										<label data-field="image_file">
+											{% if mode == 'update' and obj.getImageFile %}
+												Replace Picture
+											{% else %}
+												Picture
+											{% endif %}
+										</label>
+										<div class="m-dropzone dropzone m-dropzone--primary" action="{{ url('battery_upload_image') }}" id="image-file">
+											<div class="m-dropzone__msg dz-message needsclick">
+												<h3 class="m-dropzone__msg-title">
+													Drop files here or click to upload.
+												</h3>
+												<span class="m-dropzone__msg-desc">
+													Upload only valid PNG, GIF, or JPEG images
+												</span>
+											</div>
+										</div>
+										{% if mode == 'update' and obj.getImageFile %}
+											<span class="m-form__help">Leave blank for unchanged</span>
+										{% endif %}
+										<div class="form-control-feedback hide" data-field="image_file"></div>
+									</div>
+									{% if mode == 'update' %}
+										<div class="col-lg-6">
+											<label>&nbsp;</label>
+											<div class="portrait-box" style="background-image: url('{{ obj.getImageFile ? '/uploads/' ~ obj.getImageFile : '/assets/images/battery.gif' }}');"></div>
+										</div>
+									{% endif %}
+								</div>
 							</div>
 							<div class="m-form__seperator m-form__seperator--dashed"></div>
 							<div class="m-form__section">
@@ -107,7 +138,7 @@
                                         <label data-field="warr_private">
                                             Personal
                                         </label>
-										<input type="number" name="warr_private" class="form-control m-input" value="{{ obj.getWarrantyPrivate() }}">
+										<input type="number" name="warr_private" class="form-control m-input" value="{{ obj.getWarrantyPrivate }}">
 										<div class="form-control-feedback hide" data-field="warr_private"></div>
 										<span class="m-form__help">In months</span>
 									</div>
@@ -115,7 +146,7 @@
                                         <label data-field="warr_commercial">
                                             Commercial
                                         </label>
-										<input type="number" name="warr_commercial" class="form-control m-input" value="{{ obj.getWarrantyCommercial() }}">
+										<input type="number" name="warr_commercial" class="form-control m-input" value="{{ obj.getWarrantyCommercial }}">
                                         <div class="form-control-feedback hide" data-field="warr_commercial"></div>
                                         <span class="m-form__help">In months</span>
                                     </div>
@@ -133,7 +164,7 @@
                                         <label data-field="length">
                                             Length
                                         </label>
-                                        <input type="number" name="length" class="form-control m-input" value="{{ obj.getLength() }}">
+                                        <input type="number" name="length" class="form-control m-input" value="{{ obj.getLength }}">
                                         <div class="form-control-feedback hide" data-field="length"></div>
                                         <span class="m-form__help">In millimeters (mm)</span>
                                     </div>
@@ -141,7 +172,7 @@
                                         <label data-field="width">
                                             Width
                                         </label>
-                                        <input type="number" name="width" class="form-control m-input" value="{{ obj.getWidth() }}">
+                                        <input type="number" name="width" class="form-control m-input" value="{{ obj.getWidth }}">
                                         <div class="form-control-feedback hide" data-field="width"></div>
                                         <span class="m-form__help">In millimeters (mm)</span>
                                     </div>
@@ -149,7 +180,7 @@
                                         <label data-field="height">
                                             Height
                                         </label>
-                                        <input type="number" name="height" class="form-control m-input" value="{{ obj.getHeight() }}">
+                                        <input type="number" name="height" class="form-control m-input" value="{{ obj.getHeight }}">
                                         <div class="form-control-feedback hide" data-field="height"></div>
                                         <span class="m-form__help">In millimeters (mm)</span>
                                     </div>
@@ -159,7 +190,7 @@
                                         <label data-field="total_height">
                                             Total Height
                                         </label>
-                                        <input type="number" name="total_height" class="form-control m-input" value="{{ obj.getTotalHeight() }}">
+                                        <input type="number" name="total_height" class="form-control m-input" value="{{ obj.getTotalHeight }}">
                                         <div class="form-control-feedback hide" data-field="total_height"></div>
                                         <span class="m-form__help">In millimeters (mm)</span>
                                     </div>
@@ -167,7 +198,7 @@
                                         <label data-field="res_capacity">
                                             Reserve Capacity
                                         </label>
-                                        <input type="number" name="res_capacity" class="form-control m-input" value="{{ obj.getReserveCapacity() }}">
+                                        <input type="number" name="res_capacity" class="form-control m-input" value="{{ obj.getReserveCapacity }}">
                                         <div class="form-control-feedback hide" data-field="res_capacity"></div>
                                         <span class="m-form__help">In minutes</span>
                                     </div>
@@ -193,7 +224,7 @@
 										<select name="vmfg_list" class="form-control m-input" id="vmfg">
 											<option value="">Select a manufacturer</option>
 											{% for manufacturer in vmfgs %}
-												<option value="{{ manufacturer.getID() }}">{{ manufacturer.getName() }}</option>
+												<option value="{{ manufacturer.getID }}">{{ manufacturer.getName }}</option>
 											{% endfor %}
 										</select>
 									</div>
@@ -212,6 +243,7 @@
 							<div class="m-form__actions m-form__actions--solid m-form__actions--right">
 								<div class="row">
 									<div class="col-lg-12">
+										<input type="hidden" name="image_file" value="{{ obj.getImageFile }}">
 										<button type="submit" class="btn btn-success">Submit</button>
 										<a href="{{ url('battery_list') }}" class="btn btn-secondary">Cancel</a>
 									</div>
@@ -227,6 +259,31 @@
 
 {% block scripts %}
 	<script>
+		// image upload
+		Dropzone.options.imageFile = {
+            paramName: "image_file", // The name that will be used to transfer the file
+            maxFiles: 1,
+            uploadMultiple: false,
+            maxFilesize: 5, // MB
+            addRemoveLinks: true,
+            acceptedFiles: "image/*",
+            accept: function(file, done) {
+                done(); 
+            },
+            init: function() {
+				this.on("maxfilesexceeded", function(file) {
+					// limit to one file, overwrite old one
+					this.removeAllFiles();
+        			this.addFile(file);
+				});
+			},
+			success: function(file, response) {
+				if (response.success) {
+					$("input[name='image_file']").val(response.filename);
+				}
+			}
+        };
+
 		$(function() {
 			$("#row-form").submit(function(e) {
 				var form = $(this);
@@ -310,15 +367,15 @@
 
 			{% for vehicle in obj.getVehicles() %}
 				vrow = {
-					id: "{{ vehicle.getID() }}",
-					mfg_name: "{{ vehicle.getManufacturer().getName() }}",
-					make: "{{ vehicle.getMake() }}",
-					model_year_from: "{{ vehicle.getModelYearFrom() }}",
-					model_year_to: "{{ vehicle.getModelYearTo() }}"
+					id: "{{ vehicle.getID }}",
+					mfg_name: "{{ vehicle.getManufacturer.getName }}",
+					make: "{{ vehicle.getMake }}",
+					model_year_from: "{{ vehicle.getModelYearFrom }}",
+					model_year_to: "{{ vehicle.getModelYearTo }}"
 				};
 
 				vehicleRows.push(vrow);
-				vehicleIds.push("{{ vehicle.getID() }}");
+				vehicleIds.push("{{ vehicle.getID }}");
 			{% endfor %}
 
 			// update vehicle list when changing manufacturer
diff --git a/templates/battery/list.html.twig b/templates/battery/list.html.twig
index e3acf6ec..75ed93ae 100644
--- a/templates/battery/list.html.twig
+++ b/templates/battery/list.html.twig
@@ -83,6 +83,17 @@
 						title: 'ID',
 						width: 30
 					},
+					{
+						field: 'image_file',
+						title: '',
+						sortable: false,
+						width: 40,
+						template: function (row, index, datatable) {
+							var html = '<div class="user-portrait-sm" style="background-image: url(\'' + (row.image_file ? "/uploads/" + row.image_file : "/assets/images/battery.gif") + '\');"></div>';
+
+							return html;
+						}
+					},
 					/*
 					{
 						field: 'mfg_name',
diff --git a/templates/rider/form.html.twig b/templates/rider/form.html.twig
index 7e40a6c5..9be98694 100644
--- a/templates/rider/form.html.twig
+++ b/templates/rider/form.html.twig
@@ -73,7 +73,7 @@
 							<div class="form-group m-form__group row">
 								<div class="col-lg-6">
 									<label data-field="image_file">
-										{% if mode == 'update' %}
+										{% if mode == 'update' and obj.getImageFile %}
 											Replace Picture
 										{% else %}
 											Picture
@@ -89,7 +89,7 @@
 											</span>
 										</div>
 									</div>
-									{% if mode == 'update' %}
+									{% if mode == 'update' and obj.getImageFile %}
 										<span class="m-form__help">Leave blank for unchanged</span>
 									{% endif %}
 									<div class="form-control-feedback hide" data-field="image_file"></div>

From a6b1252f73ea59b3bcc06af0aecb6343342f9dbf Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Sun, 4 Feb 2018 23:40:12 +0800
Subject: [PATCH 6/6] Add outletcounter entity

---
 src/Entity/OutletCounter.php | 74 ++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 src/Entity/OutletCounter.php

diff --git a/src/Entity/OutletCounter.php b/src/Entity/OutletCounter.php
new file mode 100644
index 00000000..20050dc2
--- /dev/null
+++ b/src/Entity/OutletCounter.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\ArrayCollection;
+use Symfony\Component\Validator\Constraints as Assert;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="outlet_counter")
+ */
+class OutletCounter
+{
+    // identifying string
+    // format is "YYYYMMDD-XXX", where XXX is the outlet id
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="string", length=15)
+     * @Assert\NotBlank()
+     */
+    protected $id;
+
+    // sales counter
+    /**
+     * @ORM\Column(type="integer")
+     */
+    protected $count_sales;
+
+    // service counter
+    /**
+     * @ORM\Column(type="integer")
+     */
+    protected $count_service;
+
+    public function __construct()
+    {
+        $this->count_sales = 0;
+        $this->count_service = 0;
+    }
+
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    public function setID($id)
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    public function getSalesCounter()
+    {
+        return $this->count_sales;
+    }
+
+    public function setSalesCounter($count_sales)
+    {
+        $this->count_sales = $count_sales;
+        return $this;
+    }
+
+    public function getServiceCounter()
+    {
+        return $this->count_service;
+    }
+
+    public function setServiceCounter($count_service)
+    {
+        $this->count_service = $count_service;
+        return $this;
+    }
+}