From f5c351b17905551acb13347e2ac39f688b97bab1 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Wed, 1 Feb 2023 10:10:51 +0000 Subject: [PATCH 1/3] Add flag_active to battery model. #732 --- src/Entity/BatteryModel.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/Entity/BatteryModel.php b/src/Entity/BatteryModel.php index b516e8a6..9ee79af3 100644 --- a/src/Entity/BatteryModel.php +++ b/src/Entity/BatteryModel.php @@ -33,9 +33,17 @@ class BatteryModel */ protected $batteries; + // flag if model is active + /** + * @ORM\Column(type="boolean", options={"default": true}) + */ + protected $flag_active; + public function __construct() { $this->batteries = new ArrayCollection(); + + $this->flag_active = true; } public function getID() @@ -76,4 +84,15 @@ class BatteryModel return $str_batteries; } + + public function isActive() + { + return $this->flag_active; + } + + public function setActive($flag_active = true) + { + $this->flag_active = $flag_active; + return this; + } } -- 2.43.5 From 57b5fcf7eda33474bc0191ec7f0e37e519cba7c4 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Wed, 1 Feb 2023 10:41:57 +0000 Subject: [PATCH 2/3] Add active flag to create battery model form. #732 --- templates/battery-model/form.html.twig | 74 +++++++++++++++----------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/templates/battery-model/form.html.twig b/templates/battery-model/form.html.twig index 0f05ec51..21784666 100644 --- a/templates/battery-model/form.html.twig +++ b/templates/battery-model/form.html.twig @@ -14,37 +14,51 @@
-
-
-
-
- - - -

- {% if mode == 'update' %} - Edit Model - {{ obj.getName() }} - {% else %} - New Model - {% endif %} -

-
-
-
+
+
+
+
+ + + +

+ {% if mode == 'update' %} + Edit Model + {{ obj.getName() }} + {% else %} + New Model + {% endif %} +

+
+
+
-
-
- -
- - - Display name for this model -
-
-
+
+
+ +
+ + + Display name for this model +
+
+
+
+
+
+ + + + +
+
+
-- 2.43.5 From 9db833f0b56c0ae6aa3bd9f9a0a15324e1e45ee6 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Thu, 2 Feb 2023 01:49:30 +0000 Subject: [PATCH 3/3] Add saving of status. Add Active column for list of battery models. #732 --- src/Controller/BatteryModelController.php | 7 +++++-- src/Entity/BatteryModel.php | 2 +- templates/battery-model/list.html.twig | 17 ++++++++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) 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 = 'Yes'; + } else { + tag = 'No'; + } + + return tag; + } + }, { field: 'Actions', width: 110, @@ -143,4 +158,4 @@ }); }); -{% endblock %} \ No newline at end of file +{% endblock %} -- 2.43.5