From a20f9711b3ad632e5da31fec887e075651795d0b Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Tue, 9 May 2017 11:54:59 -0400
Subject: [PATCH] making round of changes to the admin section of the search
 plugin

removed search text from the main dashboard page of obits. added first name to the obits list.
changed articles to file uploaders and changed their data types from text to files
---
 classes/data/dataObits.php    | 11 +++--
 models/admin/obits/list.php   |  2 +-
 models/front/obits/search.php |  5 ++-
 views/admin/obits/edit.html   | 82 ++++++++++++++++++++++-------------
 views/admin/obits/index.html  |  4 +-
 views/admin/obits/list.html   |  6 ++-
 6 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/classes/data/dataObits.php b/classes/data/dataObits.php
index f35aada..f47ae77 100644
--- a/classes/data/dataObits.php
+++ b/classes/data/dataObits.php
@@ -184,29 +184,32 @@ class GlmDataObits extends GlmDataAbstract
 
             'obit_article' => array(
                 'field'    => 'obit_article',
-                'type'     => 'text',
+                'type'     => 'file',
                 'required' => false,
+                'maxSize'  => 10000,
                 'use'      => 'a',
             ),
 
             'article_a' => array(
                 'field'   => 'article_a',
-                'type'    => 'text',
+                'type'    => 'file',
                 'default' => false,
                 'use'     => 'a',
             ),
 
             'article_b' => array(
                 'field'   => 'article_b',
-                'type'    => 'text',
+                'type'    => 'file',
                 'default' => false,
+                'maxSize'  => 10000,
                 'use'     => 'a',
             ),
 
             'article_c' => array(
                 'field'   => 'article_c',
-                'type'    => 'text',
+                'type'    => 'file',
                 'default' => false,
+                'maxSize'  => 10000,
                 'use'     => 'a',
             ),
 
diff --git a/models/admin/obits/list.php b/models/admin/obits/list.php
index 75ebd9d..fdfb6f4 100644
--- a/models/admin/obits/list.php
+++ b/models/admin/obits/list.php
@@ -91,7 +91,7 @@ class GlmMembersAdmin_obits_list extends GlmDataObits
     public function modelAction($actionData = false)
     {
         $year_range = new GlmObitSupportFunctions($this->wpdb, $this->config);
-
+        $search_fields   = '';
         $numbObits       = 0;
         $option          = 'list';
         $obits           = false;
diff --git a/models/front/obits/search.php b/models/front/obits/search.php
index 4aafdf6..d792e04 100644
--- a/models/front/obits/search.php
+++ b/models/front/obits/search.php
@@ -103,7 +103,8 @@ class GlmMembersFront_obits_search extends GlmDataObits
         $get_fields     = false;
         $empty_search   = false;
         $search_fields  = false;
-       
+        $clause = '';
+               
         $this->table        = GLM_MEMBERS_OBITS_PLUGIN_DB_PREFIX . 'obits';
         
         $view               = 'search';
@@ -319,7 +320,7 @@ class GlmMembersFront_obits_search extends GlmDataObits
             if ($this->config['settings']['list_show_search_alpha']) {
 
                 $alphaSelected = false;
-
+       
                 // Check for alpha selected
                 if ($actionData['request']['alpha'] && strlen($actionData['request']['alpha']) == 1) {
                     $alphaSelected = strtoupper($actionData['request']['alpha']);
diff --git a/views/admin/obits/edit.html b/views/admin/obits/edit.html
index e37154a..cd71674 100644
--- a/views/admin/obits/edit.html
+++ b/views/admin/obits/edit.html
@@ -114,40 +114,76 @@
             <th {if $obit.fieldRequired.obit_article} class="glm-required"}{/if}>Obit Article</th>
             <td {if $obit.fieldFail.obit_article}class="glm-form-bad-input" data-tabid="glm-obits-article"{/if}>
                 <table class="glm-admin-image-edit-table">
+                
                 {if $obit.fieldData.obit_article}
+                
                 <tr>
                     <td>
                         <div class="glm-galleryImage" data-id="glm-obit-small-article">
-                            <img src="{$glmPluginMediaUrl}/images/small/{$obit.fieldData.obit_article}">
+                              <img src="{$glmPluginMediaUrl}/files/{$obit.fieldData.obit_article}"
                         </div>
                     </td>
                     <td>
-                        <input type="checkbox" name="obit_article" > Delete Image<br>
+                        <input type="checkbox" name="obit_article_delete"> Delete Image<br>
                         {$obit.fieldData.obit_article}<br>
                     </td>
                 </tr>
                 {/if}
-                <tr><td colspan="2"><b>New image:</b> <input type="file" name="obit_article"></td></tr>
+                <tr><td colspan="2"><b>New File:</b><input name="obit_article_new" class="article-input" type="file" ></td></tr>
                 </table>
                 <div id="glm-obits-articleLarger_logo" class="glm-imageDialog">
-                    <img src="{$glmPluginMediaUrl}/images/large/{$obit.fieldData.obit_article}">
+                      <img src="{$glmPluginMediaUrl}/files/{$obit.fieldData.article_b}"
                 </div>
                 {if $obit.fieldFail.obit_article}<p>{$obit.fieldFail.obit_article}{/if}
             </td>
         </tr>
         <tr>
-            <th {if $obit.fieldRequired.article_a} class="glm-required"}{/if}>Article A</th>
-            <td {if $obit.fieldFail.article_a}class="glm-form-bad-input" data-tabid="glm-article-a"{/if}>
-            <input type="text" name="article_a" value="{$obit.fieldData.article_a}" class="glm-form-text-input-short">
-            {if $obit.fieldFail.article_a}<p>{$obit.fieldFail.article_a}</p>{/if}<br>
-            </td>
+            <th {if $obit.fieldRequired.article_b} class="glm-required"}{/if}>Article B</th>
+            <td {if $obit.fieldFail.article_b}class="glm-form-bad-input" data-tabid="glm-article-b"{/if}>
+            <table class="glm-admin-image-edit-table">
+                {if $obit.fieldData.article_b}
+                <tr>
+                    <td>
+                        <div class="glm-galleryImage" data-id="glm-obit-small-article">
+                            <img src="{$glmPluginMediaUrl}/files/{$obit.fieldData.article_b}">
+                        </div>
+                    </td>
+                    <td>
+                        <input type="checkbox" name="article_b_delete" > Delete Image<br>
+                        {$obit.fieldData.article_b}<br>
+                    </td>
+                </tr>
+                {/if}
+                <tr><td colspan="2"><b>New File:</b><input name="article_b_new" class="article-input" type="file"></td></tr>
+                </table>
+                <div id="glm-obits-articleLarger_logo" class="glm-imageDialog">
+                    <img src="{$glmPluginMediaUrl}/files/{$obit.fieldData.article_b}">
+                </div>
+                {if $obit.fieldFail.article_b}<p>{$obit.fieldFail.article_b}{/if}
         </tr>
         <tr>
             <th {if $obit.fieldRequired.article_c} class="glm-required"}{/if}>Article C</th>
-            <td {if $obit.fieldFail.article_c}class="glm-form-bad-input" data-tabid="glm-arcicle-c"{/if}>
-            <input type="text" name="article_c" value="{$obit.fieldData.article_c}" class="glm-form-text-input-short">
-            {if $obit.fieldFail.article_c}<p>{$obit.fieldFail.article_c}</p>{/if}<br>
-            </td>
+            <td {if $obit.fieldFail.article_c}class="glm-form-bad-input" data-tabid="glm-article-c"{/if}>
+            <table class="glm-admin-image-edit-table">
+                {if $obit.fieldData.article_c}
+                <tr>
+                    <td>
+                        <div class="glm-galleryImage" data-id="glm-obit-small-article">
+                            <img src="{$glmPluginMediaUrl}/files/{$obit.fieldData.article_c}">
+                        </div>
+                    </td>
+                    <td>
+                        <input type="checkbox" name="article_c_delete" > Delete Image<br>
+                        {$obit.fieldData.article_c}<br>
+                    </td>
+                </tr>
+                {/if}
+                <tr><td colspan="2"><b>New File:</b>  <input name="article_c_new" class="article-input" type="file"></td></tr>
+                </table>
+                <div id="glm-obits-articleLarger_logo" class="glm-imageDialog">
+                    <img src="{$glmPluginMediaUrl}/files/{$obit.fieldData.article_c}">
+                </div>
+                {if $obit.fieldFail.article_c}<p>{$obit.fieldFail.article_c}{/if}
         </tr>
         <tr>
             <th {if $obit.fieldRequired.newspaper} class="glm-required"}{/if}>Newspaper</th>
@@ -233,7 +269,10 @@
             var fullCalendarLoaded = false;
             var recurrencesInited = false;
             var locationsInited = false;
-
+            $('.article-input').on("change", function(){
+               var file = $(this)[0].files[0].name;
+               $(this).prev().val(file);
+            });
             /*
              * Edit area tabs
              */
@@ -255,22 +294,7 @@
                     recurrencesInited = true;
                 }
 
-                if (table == 'glm-table-location') {
-
-                    if (!locationsInited) {
-
-                        // Make sure there's at least one location
-                        {if !$locations}
-                                addNewLocationForm();
-                        {/if}
 
-                        initLocations();
-                        initNewCity();
-                        locationsInited = true;
-
-                    }
-
-                }
 
                 // Count remaining characters in field
                 $('.glm-char-count').keyup( function() {
diff --git a/views/admin/obits/index.html b/views/admin/obits/index.html
index b37b2fc..bf9b2ce 100644
--- a/views/admin/obits/index.html
+++ b/views/admin/obits/index.html
@@ -5,12 +5,12 @@
 {/if}
 
     <table class="glm-admin-table">
-        <tr>
+<!--        <tr>
             <td colspan="2" align="">
                 <input  id="glmObitsList" type="text" id="autoTest" style="margin-left: 2em;">
                 <span class="glm-left">Obits Search:</span>
             </td>
-        </tr>
+        </tr>-->
 
 {if $numbObits == 0}
         <tr><td colspan="2">&nbsp;</td></tr>
diff --git a/views/admin/obits/list.html b/views/admin/obits/list.html
index 7c0af80..9ebaac6 100644
--- a/views/admin/obits/list.html
+++ b/views/admin/obits/list.html
@@ -32,7 +32,7 @@
                 </div>
                 <div class="glm-obit-admin-search"> 
                      <p class="glm-obit-search-label"><b>Birth Year: </b></p>
-                    <input type="text" name="b_year" {if 'last'|array_key_exists:$search_fields } value='{$search_fields.last}' {/if}> 
+                    <input type="text" name="b_year" {if 'birth'|array_key_exists:$search_fields } value='{$search_fields.birth}' {/if}> 
                 </div>
             </div>
             <div class="glm-small-12 glm-medium-4 glm-large-3 glm-columns obit-admin-column less-padding"> 
@@ -88,6 +88,7 @@
                 <tr>
                     <th>ID</th>
                     <th>Obit Last Name</th>
+                    <th>Obit First Name
                 </tr>
             </thead>
             <tbody>
@@ -105,6 +106,9 @@
                     <td class="glm-nowrap">
                         <a href="{$thisUrl}?page={$thisPage}&glm_action=list&option=edit&obit={$e.id}">{$e.last_name}</a>
                     </td>
+                    <td class="glm-nowrap">
+                        <a href="{$thisUrl}?page={$thisPage}&glm_action=list&option=edit&obit={$e.id}">{$e.first_mid}</a>
+                    </td>
                 </tr>
         {/foreach}
     {else}
-- 
2.17.1