Added display contry and club

go-form-plugin/templates/table.php

@@ -6,8 +6,15 @@
         <th>First Name</th>
         <th>Last Name</th>
         <th>Rank</th>
+        <?php if ($show_admin): ?>
+          <th>Rating</th>
+        <?php endif; ?>
         <th>Country</th>
         <th>Club</th>
+        <?php if ($show_admin): ?>
+          <th>Country (raw)</th>
+          <th>Club (raw)</th>
+        <?php endif; ?>
         <th>EGD Number</th>
         <th>Date Added</th>
         <?php
@@ -17,11 +24,10 @@
             echo '<th>' . esc_html($field->field_name) . '</th>';
           endif;
         endforeach;
-        ?>
-        <?php if ($show_admin): ?>
-          <th>Rating</th>
-          <th>Action</th>
-        <?php endif; ?>
+        
+        if ($show_admin):
+         echo '<th>Action</th>';
+        endif; ?>
       </tr>
     </thead>
     <tbody>
@@ -33,8 +39,15 @@
           <td> <?= esc_html($e->first_name) ?> </td>
           <td> <?= esc_html($e->last_name) ?> </td>
           <td> <?= esc_html($ranks[$e->rank]) ?> </td>
-          <td> <?= esc_html($e->country) ?> </td>
-          <td> <?= esc_html($e->club) ?> </td>
+          <?php if ($show_admin): ?>
+            <td> <?= esc_html($e->rating) ?> </td>
+          <?php endif; ?>
+          <td> <?= esc_html($e->display_country) ?> </td>
+          <td> <?= esc_html($e->display_club) ?> </td>
+          <?php if ($show_admin): ?>
+            <td> <?= esc_html($e->country) ?> </td>
+            <td> <?= esc_html($e->club) ?> </td>
+          <?php endif; ?>
           <td><a
               href="<?= esc_url('https://europeangodatabase.eu/EGD/Player_Card.php?&key=' . $e->egd_number) ?>"><?= esc_html($e->egd_number) ?>
             </a> </td>
@@ -57,7 +70,6 @@
 
           <?php if ($show_admin): ?>
 
-            <td> <?= esc_html($e->rating) ?> </td>
             <td style="white-space: nowrap;">
               <a href="<?= add_query_arg(array('page' => 'go-form-settings', 'form_id' => $form_id ?? 0, 'edit_entry' => $e->id), admin_url('admin.php')) ?>"
                 class="button" style="margin-right: 4px;">Edit</a>