refs #20655 [fid] create some separate column field templates and split column...

refs #20655 [fid] create some separate column field templates and split column configuration for user and admin order list

* due date
* edit

fid/config/vufind/fid.ini

@@ -38,9 +38,18 @@ user_list_export_file_prefix = 'export'
 ; of not given, options will be job_title_0, job_title_1
 ;jobTitleOptions = "0,1"
 
-; examples on configure order listings cols ordering
-; user, edit & delete cols are only shown at admins order list
-[OrderList]
+;configure columns of user's order listings
+[OrderListUser]
+displayCols[] = 'date'
+displayCols[] = 'type'
+displayCols[] = 'user'
+displayCols[] = 'record'
+;displayCols[] = 'status'
+;displayCols[] = 'dueDate'
+
+;configure columns of admins's order listings
+;additional columns like user, edit & delete
+[OrderListAdmin]
 displayCols[] = 'date'
 displayCols[] = 'type'
 displayCols[] = 'user'

module/fid/src/Controller/UserController.php

@@ -997,7 +997,7 @@ class UserController extends AbstractBase
             $user = $this->client->requestUserDetails(null, true);
             $viewModel = $this->createViewModel();
             $orders = $user->getOrders();
-            $displayCols = array_diff($this->config['OrderList']['displayCols'], ['user','edit','delete']);
+            $displayCols = $this->config['OrderListUser']['displayCols'];
             $viewModel->setVariables(compact('orders', 'displayCols'));
             $viewModel->setTemplate('fid/order/order-list');
             return $viewModel;
@@ -1020,7 +1020,7 @@ class UserController extends AbstractBase
         try {
             $orders = $this->client->requestOrderList();
             $viewModel = $this->createViewModel();
-            $displayCols = $this->config['OrderList']['displayCols'];
+            $displayCols = $this->config['OrderListAdmin']['displayCols'];
             $viewModel->setVariables(compact('orders', 'displayCols'));
             $viewModel->setTemplate('fid/order/order-list-admin');
             return $viewModel;

themes/fid/templates/fid/order/list/entry.phtml

 <!-- fid: fid - order - list - entry -->
-<?php
-use fid\Controller\RecordController;
-?>
 <?php foreach($this->displayCols as $col): ?>
   <?php switch ($col):
     case 'user': ?>
@@ -37,16 +34,12 @@ use fid\Controller\RecordController;
       <?php break; ?>
     <?php case 'dueDate': ?>
       <td>
-        <?= ($order->getType() == RecordController::PDA) && ($order->isOverdue()) && ($order->getStatus() != 'completed')
-            ? "<div class=\"alert alert-danger\" role=\"alert\">{$this->icon('warning')}{$order->displayDueDate()}</div>"
-            : $order->displayDueDate() ?>
+        <?=$this->render('fid/order/list/field-due-date')?>
       </td>
       <?php break; ?>
     <?php case 'edit': ?>
       <td>
-        <a href="<?=$this->url('fid/admin/editOrder', ['orderid' => $order->getId()])?>">
-            <?=$this->icon('pen')?>
-        </a>
+        <?=$this->render('fid/order/list/field-edit')?>
       </td>
       <?php break; ?>
     <?php case 'delete': ?>

themes/fid/templates/fid/order/list/field-due-date.phtml

+<!-- fid: fid - order - list - field-due-date -->
+<?php
+use fid\Controller\RecordController;
+?>
+<?= ($order->getType() == RecordController::PDA) && ($order->isOverdue()) && ($order->getStatus() != 'completed')
+    ? "<div class=\"alert alert-danger\" role=\"alert\"><i aria-hidden=\"true\" class=\"fa fa-warning\"></i>{$order->displayDueDate()}</div>"
+    : $order->displayDueDate() ?>
+<!-- fid: fid - order - list - field-due-date - END -->

themes/fid/templates/fid/order/list/field-edit.phtml

+<!-- fid: fid - order - list - field-edit -->
+<a href="<?=$this->url('fid/admin/editOrder', ['orderid' => $order->getId()])?>">
+  <i aria-hidden="true" class="fa fa-edit">
+</a>
+<!-- fid: fid - order - list - field-edit - END -->