diff --git a/src/Controller/BatteryModelController.php b/src/Controller/BatteryModelController.php
index ffdfc25a..dd690082 100644
--- a/src/Controller/BatteryModelController.php
+++ b/src/Controller/BatteryModelController.php
@@ -88,6 +88,7 @@ class BatteryModelController extends Controller
             // add row data
             $row['id'] = $orow->getID();
             $row['name'] = $orow->getName();
+            $row['flag_active'] = $orow->isActive(); 
 
             // add row metadata
             $row['meta'] = [
@@ -134,7 +135,8 @@ class BatteryModelController extends Controller
         $row = new BatteryModel();
 
         // set and save values
-        $row->setName($req->request->get('name'));
+        $row->setName($req->request->get('name'))
+            ->setActive($req->request->get('flag_active', false));
 
         // validate
         $errors = $validator->validate($row);
@@ -202,7 +204,8 @@ class BatteryModelController extends Controller
             throw $this->createNotFoundException('The item does not exist');
 
         // set and save values
-        $row->setName($req->request->get('name'));
+        $row->setName($req->request->get('name'))
+            ->setActive($req->request->get('flag_active', false));
 
         // validate
         $errors = $validator->validate($row);
diff --git a/src/Entity/BatteryModel.php b/src/Entity/BatteryModel.php
index 9ee79af3..a1414551 100644
--- a/src/Entity/BatteryModel.php
+++ b/src/Entity/BatteryModel.php
@@ -93,6 +93,6 @@ class BatteryModel
     public function setActive($flag_active = true)
     {
         $this->flag_active = $flag_active;
-        return this;
+        return $this;
     }   
 }
diff --git a/templates/battery-model/list.html.twig b/templates/battery-model/list.html.twig
index 4af0226d..9645d7f9 100644
--- a/templates/battery-model/list.html.twig
+++ b/templates/battery-model/list.html.twig
@@ -87,6 +87,21 @@
 						field: 'name',
 						title: 'Name'
 					},
+                                        {
+                                            field: 'flag_active',
+                                            title: 'Active',
+                                            template: function (row, index, datatable) {
+                                                var tag = '';
+
+                                                if (row.flag_active === true) {
+                                                    tag = '<span class="m-badge m-badge--success m-badge--wide">Yes</span>';
+                                                } else {
+                                                    tag = '<span class="m-badge m-badge--danger m-badge--wide">No</span>';
+                                                }
+
+                                                return tag;
+                                            }
+                                        },
 					{
 						field: 'Actions',
 						width: 110,
@@ -143,4 +158,4 @@
 			});
 		});
 	</script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}