From 7be2d7d11f9c6178fe9515d0d4d8ba8da168ed0f Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Fri, 27 Sep 2024 10:31:50 +0300
Subject: [PATCH] Fix EnrollmentFlow broken start view. Fix petitions view.

---
 app/src/View/Helper/FieldHelper.php      |  10 ++-
 app/templates/EnrollmentFlows/fields.inc |   3 +
 app/templates/EnrollmentFlows/start.inc  |  51 +++++++++++
 app/templates/EnrollmentFlows/start.php  |  26 ++----
 app/templates/Petitions/fields.inc       | 106 +++++++++++------------
 5 files changed, 122 insertions(+), 74 deletions(-)
 create mode 100644 app/templates/EnrollmentFlows/start.inc

diff --git a/app/src/View/Helper/FieldHelper.php b/app/src/View/Helper/FieldHelper.php
index ca2fa9431..70e1d8324 100644
--- a/app/src/View/Helper/FieldHelper.php
+++ b/app/src/View/Helper/FieldHelper.php
@@ -38,6 +38,14 @@
 class FieldHelper extends Helper {
   public $helpers = ['Form', 'Html'];
 
+  /**
+   * List of predefined editable form actions
+   */
+  public const EDITABLE_ACTIONS = [
+    'add', 'edit', // CRUD actions
+    'start'        // ENROLLMENT FLOW actions
+  ];
+
   // Is this read-only or read-write?
   protected bool $editable = true;
   
@@ -74,7 +82,7 @@ public function initialize(array $config): void
     $this->reqFields = $this->getView()->get('vv_required_fields');
     $this->modelName = $this->getView()->getName();
     $this->action = $this->getView()->get('vv_action');
-    $this->editable = \in_array($this->action, ['add', 'edit']);
+    $this->editable = \in_array($this->action, self::EDITABLE_ACTIONS, true);
     $this->pluginName = $this->getView()->getPlugin();
     $this->entity = $this->getView()->get('vv_obj');
     $this->fieldTypes = $this->getView()->get('vv_field_types');
diff --git a/app/templates/EnrollmentFlows/fields.inc b/app/templates/EnrollmentFlows/fields.inc
index d4fac9f50..df72eb6b5 100644
--- a/app/templates/EnrollmentFlows/fields.inc
+++ b/app/templates/EnrollmentFlows/fields.inc
@@ -24,6 +24,9 @@
  * @since         COmanage Registry v5.0.0
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
+
+declare(strict_types = 1);
+
 ?>
 <script type="text/javascript">
   // JS specific to these fields
diff --git a/app/templates/EnrollmentFlows/start.inc b/app/templates/EnrollmentFlows/start.inc
new file mode 100644
index 000000000..446ef0a98
--- /dev/null
+++ b/app/templates/EnrollmentFlows/start.inc
@@ -0,0 +1,51 @@
+<?php
+/**
+ * COmanage Registry Enrollment Flow Start Fields
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry
+ * @since         COmanage Registry v5.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+declare(strict_types = 1);
+
+// $this->name = Models
+$modelsName = $this->name;
+// $tablename = models
+$tableName = \Cake\Utility\Inflector::tableize(\Cake\Utility\Inflector::singularize($this->name));
+// Table Reference
+$modelTable = $this->Tab->getModelTableReference($modelsName);
+
+
+// For now, we just request the enrollee email. We're only called if
+// collect_enrollee_email is true, so we don't need to check it, though
+// if we ever add more fields to the start form we should.
+print $this->element('form/listItem', [
+  'arguments' => [
+    'fieldName' => 'enrollee_email',
+    'fieldOptions' => [
+      'required' => true
+    ],
+    'fieldType' => 'string'
+  ]
+]);
+
+// Any hidden fields??
diff --git a/app/templates/EnrollmentFlows/start.php b/app/templates/EnrollmentFlows/start.php
index 732f70f32..89cb1acc2 100644
--- a/app/templates/EnrollmentFlows/start.php
+++ b/app/templates/EnrollmentFlows/start.php
@@ -27,27 +27,13 @@
 
 declare(strict_types = 1);
 
-// For now, we just request the enrollee email. We're only called if
-// collect_enrollee_email is true, so we don't need to check it, though
-// if we ever add more fields to the start form we should.
+// Enrollment Flow Start has its own file of fields
+$this->set('vv_fields_inc', 'start.inc');
 
+// Create the Form
 print $this->Form->create();
-
-print $this->Field->startControlSet(
-  modelName: $this->name,
-  action: $vv_action,
-  editable: true,
-  reqFields: []
-);
-
-print $this->Field->control(
-  fieldName: 'enrollee_email',
-  controlType: 'string',
-  options: ['required' => true]
-);
-
-print $this->Field->submit(__d('operation', 'save'));
-
+// Form body
+print $this->element('form/unorderedList');
+// Close the Form
 print $this->Form->end();
 
-print $this->Field->endControlSet();
diff --git a/app/templates/Petitions/fields.inc b/app/templates/Petitions/fields.inc
index b89841d3f..bcef2eaa0 100644
--- a/app/templates/Petitions/fields.inc
+++ b/app/templates/Petitions/fields.inc
@@ -25,63 +25,63 @@
  * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
 
+declare(strict_types = 1);
+
+use \Cake\Utility\Hash;
+
 // Petitions are read-only, though they can link to other actions
 if($vv_action == 'view') {
   // Start with the petition metadata
-  print $this->Field->control('status');
-
-  print $this->Field->statusControl(
-    fieldName:  'enrollee_person_id',
-    status:     !empty($vv_obj->enrollee_person->primary_name)
-                ? $vv_obj->enrollee_person->primary_name->full_name
-                : __d('field', 'Petitions.enrollee.new'),
-    link:       (!empty($vv_obj->enrollee_person->id)
-                 ? ['url' => [
-                    'controller' => 'people', 
-                    'action' => 'edit', 
-                    $vv_obj->enrollee_person_id
-                   ]]
-                 : [])
-  );
-
-  print $this->Field->statusControl(
-    fieldName:  'petitioner_person_id',
-    status:     !empty($vv_obj->petitioner_person->primary_name)
-                ? $vv_obj->petitioner_person->primary_name->full_name
-                : "",
-    link:       (!empty($vv_obj->petitioner_person->id)
-                 ? ['url' => [
-                    'controller' => 'people', 
-                    'action' => 'edit', 
-                    $vv_obj->enrollee_person_id
-                   ]]
-                 : [])
-  );
-
-// XXX petitioner_identifier if set?
-
-  print "<ol>\n";
-
-// XXX merge this with resume?
-  foreach($vv_obj->enrollment_flow->enrollment_flow_steps as $step) {
-    $stepId = $step->id;
-
-    print "<li>" . $step->description;
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'status',
+    ]
+  ]);
 
-    $result = \Cake\Utility\Hash::extract($vv_obj->petition_step_results, "{n}[enrollment_flow_step_id=$stepId]");
+  // Enrollee
+  $enrolleeStatus = $vv_obj->enrollee_person->primary_name->full_name ?? __d('field', 'Petitions.enrollee.new');
+  $enrolleeLink = [
+    'url' => [
+      'controller' => 'people',
+      'action' => 'edit',
+      $vv_obj->enrollee_person_id
+    ]
+  ];
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'enrollee_person_id',
+      'status' => $enrolleeStatus,
+      'link' => !empty($vv_obj->enrollee_person->id) ? $enrolleeLink : [],
+    ]
+  ]);
 
-    if(!empty($result)) {
-      print ", Result: " . $result[0]->comment 
-            . $this->Html->link(' (View)', [
-                'controller' => 'petitions',
-                'action' => 'result',
-                $vv_obj->id,
-                '?' => ['enrollment_flow_step_id' => $step->id]
-              ]);
-    }
+  // Petitioner
+  $petitionerStatus = $vv_obj?->petitioner_person?->primary_name?->full_name ?? '';
+  $petitionerLink = [
+    'url' => [
+      'controller' => 'people',
+      'action' => 'edit',
+      $vv_obj->petitioner_person->id
+    ]
+  ];
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'petitioner_person_id',
+      'status' => $petitionerStatus,
+      'link' => !empty($vv_obj->petitioner_person->id) ? $petitionerLink : []
+    ]
+  ]);
 
-    print "</li>\n";
-  }
+?>
 
-  print "</ol>\n";
-}
+<ol>
+  <?php foreach($vv_obj->enrollment_flow->enrollment_flow_steps as $step): ?>
+    <li><?= $step->description ?>
+      <?php $result = Hash::extract($vv_obj->petition_step_results, "{n}[enrollment_flow_step_id=$step->id]"); ?>
+      <?php if (!empty($result)): ?>
+        <pre> ,Result: <?= $result[0]->comment ?></pre>
+        <a class="ml-1" href="petitions/result/<?= $vv_obj->id ?>?enrollment_flow_step_id=<?=$step->id?>">(View)</a>
+      <?php endif; ?>
+    </li>
+  <?php endforeach; ?>
+</ol>