From ccee52abece8711f2e69752b691d5533dc32edaa Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Sat, 27 Apr 2024 19:26:29 +0300
Subject: [PATCH] Pronouns,ProvisioningTargets,ProvisioningHistoryRecords

---
 app/templates/Pronouns/fields.inc             | 31 +++++++++--
 .../ProvisioningHistoryRecords/fields.inc     | 54 +++++++++++-------
 app/templates/ProvisioningTargets/fields.inc  | 55 ++++++++++++-------
 app/templates/element/form/listItem.php       |  1 +
 4 files changed, 94 insertions(+), 47 deletions(-)

diff --git a/app/templates/Pronouns/fields.inc b/app/templates/Pronouns/fields.inc
index a5361fc5e..aa57d4a69 100644
--- a/app/templates/Pronouns/fields.inc
+++ b/app/templates/Pronouns/fields.inc
@@ -26,13 +26,34 @@
  */
 
 if($vv_action == 'add' || $vv_action == 'edit' || $vv_action == 'view') {
-  print $this->Field->control('pronouns');
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'pronouns'
+    ]]);
 
-  print $this->Field->control('type_id', ['default' => $vv_default_type]);
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'type_id',
+      'options' => [
+        'default' => $vv_default_type
+      ]
+    ]]);
 
-  print $this->Field->control('language');
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'language'
+    ]]);
 
-  print $this->Field->control('frozen');
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'frozen'
+    ]]);
+}
 
-  print $this->Field->sourceControl($vv_obj);
+if($vv_action == 'edit' || $vv_action == 'view') {
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'source',
+      'entity' => $vv_obj
+    ]]);
 }
diff --git a/app/templates/ProvisioningHistoryRecords/fields.inc b/app/templates/ProvisioningHistoryRecords/fields.inc
index d6b9ca9ec..d1b8e63d1 100644
--- a/app/templates/ProvisioningHistoryRecords/fields.inc
+++ b/app/templates/ProvisioningHistoryRecords/fields.inc
@@ -40,29 +40,41 @@ if($vv_action == 'view') {
         $vv_obj->person->id
       ],
     ];
-    
-    print $this->Field->statusControl(
-      'person_id',
-      $vv_obj->person->primary_name->full_name,
-      $viewLink
-    );
+
+    print $this->element('form/listItem', [
+      'arguments' => [
+        'fieldName' => 'person_id',
+        'status' => $vv_obj->person->primary_name->full_name,
+        'link' => $viewLink,
+      ]
+    ]);
   } else {
-    print $this->Field->statusControl(
-      'group_id',
-      $vv_obj->group->name,
-      [
-        'url' => [
-          'controller'  => 'groups',
-          'action'      => 'edit',
-          $vv_obj->group->id
-        ]
+    $viewLink = [
+      'url' => [
+        'controller'  => 'groups',
+        'action'      => 'edit',
+        $vv_obj->group->id
       ]
-    );
-  }
+    ];
 
-  print $this->Field->control('subject_model');
+    print $this->element('form/listItem', [
+      'arguments' => [
+        'fieldName' => 'group_id',
+        'status' => $vv_obj->group->name,
+        'link' => $viewLink,
+      ]
+    ]);
+  }
 
-  print $this->Field->control('subjectid');
-  
-  print $this->Field->control('created');
+  foreach([
+            'subject_model',
+            'subjectid',
+            'created',
+          ] as $field) {
+    print $this->element('form/listItem', [
+      'arguments' => [
+        'fieldName' => $field
+      ]
+    ]);
+  }
 }
diff --git a/app/templates/ProvisioningTargets/fields.inc b/app/templates/ProvisioningTargets/fields.inc
index fd4ed02cf..0162116d2 100644
--- a/app/templates/ProvisioningTargets/fields.inc
+++ b/app/templates/ProvisioningTargets/fields.inc
@@ -49,28 +49,41 @@ alert("Queue modes not yet implemented"); // XXX CFM-26
 <?php
 // This view does not support read-only
 if($vv_action == 'add' || $vv_action == 'edit') {
-  print $this->Field->control('description');
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'description'
+    ]]);
 
-  print $this->Field->control(
-    fieldName: 'status', 
-    options: [
-      'onChange' => 'updateGadgets()',
-      'default'  => \App\Lib\Enum\ProvisionerModeEnum::QueueOnError
-    ]
-  );
-  
-  print $this->Field->control(
-    fieldName: 'retry_interval', 
-    options: [
-      'default' => 900
-    ],
-    cssClass: 'subfield'
-  );
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'description',
+      'options' => [
+        'onChange' => 'updateGadgets()',
+        'default'  => \App\Lib\Enum\ProvisionerModeEnum::QueueOnError
+      ]
+    ]]);
 
-  print $this->Field->control('plugin');
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'description',
+      'options' => [
+        'default' => 900
+      ]
+    ]]);
 
-// Not yet implemented (CFM-26)
-//  print $this->Field->control('provisioning_group_id');
-  
-  print $this->Field->control('ordr');
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'plugin'
+    ]]);
+
+//  // todo: Not yet implemented (CFM-26)
+//  print $this->element('form/listItem', [
+//    'arguments' => [
+//      'fieldName' => 'provisioning_group_id'
+//    ]]);
+
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'ordr'
+    ]]);
 }
diff --git a/app/templates/element/form/listItem.php b/app/templates/element/form/listItem.php
index 6505d3e1d..c14ba9e6e 100644
--- a/app/templates/element/form/listItem.php
+++ b/app/templates/element/form/listItem.php
@@ -43,6 +43,7 @@
   'datetime',
   'timestamp'     => 'fields-datepicker ',
   'source_record' => 'source-record ',
+  'retry_interval',
   'login'         => 'subfield ',
   default         => ''
 };