commit ad645f693d6363e37724a18a0b3b7a5daf1cebb4
parent 0cfaa738c46f844153eab2ba05a7542059e2f4ca
Author: William Lindholm <william_lindholm@outlook.com>
Date: Thu, 28 Sep 2023 15:48:17 +0000
Added dateSelector for modalBuilder.
Diffstat:
4 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/incident.php b/incident.php
@@ -19,8 +19,8 @@
->setTableName("Operation")
->setPostHandler($handlerFactory->createHandler('Operation'))
->addColumn("OperationName")
- ->addColumn("StartDate")
- ->addColumn("EndDate", true)
+ ->addDateColumn("StartDate")
+ ->addDateColumn("EndDate", true)
->addColumn("SuccessRate", true)
->addDropdownColumn("GroupLeader", getColumnValues("GroupLeaders", "CodeName"))
->addHiddenColumn("Incident", "{$incidentName}, {$incidentNumber}");
@@ -56,7 +56,7 @@
->setTableName("Report")
->setPostHandler($handlerFactory->createHandler('Report'))
->addColumn("Title")
- ->addColumn("DateCreated")
+ ->addDateColumn("DateCreated")
->addDropdownColumn("Author", getColumnValues("Agent", "CodeName"))
->addColumn("Content")
->addHiddenColumn("IncidentName", $incidentName)
diff --git a/operations.php b/operations.php
@@ -14,8 +14,8 @@
->setTableName("Operation")
->setPostHandler($handlerFactory->createHandler('Operation'))
->addColumn("OperationName")
- ->addColumn("StartDate")
- ->addColumn("EndDate", true)
+ ->addDateColumn("StartDate")
+ ->addDateColumn("EndDate")
->addColumn("SuccessRate", true)
->addDropdownColumn("GroupLeader", getColumnValues("GroupLeaders", "CodeName"))
->addDropdownColumn("Incident", GetCompositeKeyValues("Incident", ["IncidentName", "IncidentNumber"]));
diff --git a/utils/logs.txt b/utils/logs.txt
@@ -744,3 +744,19 @@
2023-09-28 15:34:06 - Inserting into: Agent
2023-09-28 15:34:30 - Inserting into: FieldAgentAttributes
2023-09-28 15:34:50 - Inserting into: OperatesIn
+2023-09-28 15:36:40 - Incident: 'Sabotage', '103'
+2023-09-28 15:42:58 - Inserting into: Operation
+2023-09-28 15:42:58 - calling from OperationInsertHandler: $incident = Heist, 101
+2023-09-28 15:42:58 - IncidentName= Heist
+2023-09-28 15:42:58 - IncidentNumber= 101
+2023-09-28 15:43:15 - Incident: 'asdasdasd', '12312323'
+2023-09-28 15:43:30 - Incident: 'asdasdasd', '12312323'
+2023-09-28 15:43:58 - Incident: 'asdasdasd', '12312323'
+2023-09-28 15:44:15 - Incident: 'asdasdasd', '12312323'
+2023-09-28 15:44:15 - Inserting into: Report
+2023-09-28 15:44:15 - Incident: 'asdasdasd', '12312323'
+2023-09-28 15:45:03 - Incident: 'asdasdasd', '12312323'
+2023-09-28 15:45:03 - Inserting into: Report
+2023-09-28 15:45:03 - Incident: 'asdasdasd', '12312323'
+2023-09-28 15:45:11 - Incident: 'asdasdasd', '12312323'
+2023-09-28 15:45:12 - Incident: 'asdasdasd', '12312323'
diff --git a/utils/modalBuilder.php b/utils/modalBuilder.php
@@ -5,6 +5,7 @@
private $dropdownColumns = [];
private $requiredColumns = [];
private $hiddenColumns = [];
+ private $dateColumns = [];
private $modalId;
private $postHandler;
@@ -33,6 +34,11 @@
return $this;
}
+ public function addDateColumn($column) {
+ $this->dateColumns[] = $column;
+ return $this;
+ }
+
public function addHiddenColumn($column, $value) {
$this->hiddenColumns[$column] = $value;
return $this;
@@ -75,6 +81,13 @@
</div>";
}
+ foreach ($this->dateColumns as $column) {
+ $modalBody .= "<div class='form-group'>
+ <label for='$column'>$column</label>
+ <input type='date' class='form-control' id='$column' name='$column'>
+ </div>";
+ }
+
foreach ($this->dropdownColumns as $column => $values) {
$options = '';
foreach ($values as $value) {