From b0bd6b3acb3e668f9eb6e95c66f69f1ec8c27c64 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 27 Feb 2017 16:19:51 -0500
Subject: [PATCH] WIP for edit page.

worked on getting the form to add an entry to the obits table.
---
 classes/data/dataObits.php  |   2 +-
 models/admin/obits/list.php |   7 ++-
 views/admin/obits/edit.html | 104 +++++++++++++++++++++++++++++++++---
 views/admin/obits/list.html |  26 ++-------
 4 files changed, 104 insertions(+), 35 deletions(-)

diff --git a/classes/data/dataObits.php b/classes/data/dataObits.php
index f29e397..0b4fe5b 100644
--- a/classes/data/dataObits.php
+++ b/classes/data/dataObits.php
@@ -164,7 +164,7 @@ class GlmDataObits extends GlmDataAbstract
                 'field'    => 'd_yr_range',
                 'type'     => 'integer',
                 'default'  => '',
-                'required' => false,
+                'required' => true,
                 'use'      => 'a',
             ),
 
diff --git a/models/admin/obits/list.php b/models/admin/obits/list.php
index 09f0334..04d06c0 100644
--- a/models/admin/obits/list.php
+++ b/models/admin/obits/list.php
@@ -154,8 +154,7 @@ class GlmMembersAdmin_obits_list extends GlmDataObits
                     $obitAdded = true;
 
                     // Update created timestamp and name slug for URLs
-                    $this->updateTimestamp('created', $this->obitID);
-                    $this->updateSlug($this->obitID);
+                    //$this->updateSlug($this->obitID);
 
                     // Get this again so we have the created date
                     $obit = $this->editEntry($this->obitID);
@@ -305,8 +304,8 @@ class GlmMembersAdmin_obits_list extends GlmDataObits
             'start'           => $start = 1,
             'limit'           => $limit,
             'namesList'       => $namesList,
-            'obitDeleted'      => $obitDeleted,
-            'obitDeleteError'  => $obitDeleteError,
+            'obitDeleted'     => $obitDeleted,
+            'obitDeleteError' => $obitDeleteError,
 
         );
 
diff --git a/views/admin/obits/edit.html b/views/admin/obits/edit.html
index e972c8d..6493ac3 100644
--- a/views/admin/obits/edit.html
+++ b/views/admin/obits/edit.html
@@ -40,47 +40,137 @@
         <tr>
             <th {if $obit.fieldRequired.last_name}class="glm-required"{/if}>Last Name:</th>
             <td {if $obit.fieldFail.last_name}class="glm-form-bad-input" data-tabid="glm-obit-descr"{/if}>
-                <input type="text" name="last_name" value="{$obit.fieldData.last_name}" class="glm-form-text-input-small">
+                <input type="text" name="last_name" value="{$obit.fieldData.last_name}" class="glm-form-text-input-short">
                 {if $obit.fieldFail.last_name}<p>{$obit.fieldFail.last_name}</p>{/if}<br>
             </td>
         </tr>
         <tr>
             <th {if $obit.fieldRequired.first_mid}class="glm-required"{/if}>First and Middle Name:</th>
             <td {if $obit.fieldFail.first_mid}class="glm-form-bad-input" data-tabid="glm-obit-descr"{/if}>
-                <input type="text" name="first_mid" value="{$obit.fieldData.first_mid}" class="glm-form-text-input-small">
+                <input type="text" name="first_mid" value="{$obit.fieldData.first_mid}" class="glm-form-text-input-short">
                 {if $obit.fieldFail.first_mid}<p>{$obit.fieldFail.first_mid}</p>{/if}<br>
             </td>
         </tr>
         <tr>
             <th {if $obit.fieldRequired.b_year}class="glm-required"{/if}>Birth Year:</th>
             <td {if $obit.fieldFail.b_year}class="glm-form-bad-input" data-tabid="glm-obit-descr"{/if}>
-                <input type="text" name="b_year" value="{$obit.fieldData.b_year}" class="glm-form-text-input-small">
+                <input type="text" name="b_year" value="{$obit.fieldData.b_year}" class="glm-form-text-input-short">
                 {if $obit.fieldFail.b_year}<p>{$obit.fieldFail.b_year}</p>{/if}<br>
             </td>
         </tr>
         <tr>
             <th {if $obit.fieldRequired.b_yr_range}class="glm-required"{/if}>Birth Year Range:</th>
             <td {if $obit.fieldFail.b_yr_range}class="glm-form-bad-input" data-tabid="glm-obit-descr"{/if}>
-                <input type="text" name="b_yr_range" value="{$obit.fieldData.b_yr_range}" class="glm-form-text-input-small">
+                <input type="text" name="b_yr_range" value="{$obit.fieldData.b_yr_range}" class="glm-form-text-input-short">
                 {if $obit.fieldFail.b_yr_range}<p>{$obit.fieldFail.b_yr_range}</p>{/if}<br>
             </td>
         </tr>
         <tr>
             <th {if $obit.fieldRequired.d_year}class="glm-required"{/if}>Death Year:</th>
             <td {if $obit.fieldFail.d_year}class="glm-form-bad-input" data-tabid="glm-obit-descr"{/if}>
-                <input type="text" name="d_year" value="{$obit.fieldData.d_year}" class="glm-form-text-input-small">
+                <input type="text" name="d_year" value="{$obit.fieldData.d_year}" class="glm-form-text-input-short">
                 {if $obit.fieldFail.d_year}<p>{$obit.fieldFail.d_year}</p>{/if}<br>
             </td>
         </tr>
         <tr>
             <th {if $obit.fieldRequired.d_yr_range}class="glm-required"{/if}>Death Year Range:</th>
             <td {if $obit.fieldFail.d_yr_range}class="glm-form-bad-input" data-tabid="glm-obit-descr"{/if}>
-                <input type="text" name="d_yr_range" value="{$obit.fieldData.d_yr_range}" class="glm-form-text-input-small">
+                <input type="text" name="d_yr_range" value="{$obit.fieldData.d_yr_range}" class="glm-form-text-input-short">
                 {if $obit.fieldFail.d_yr_range}<p>{$obit.fieldFail.d_yr_range}</p>{/if}<br>
             </td>
         </tr>
-    </table>
+        <tr>
+            <th {if $obit.fieldRequired.maiden_other} class="glm-required"}{/if}>Maiden Other</th>
+            <td {if $obit.fieldFail.maiden_other}class="glm-form-bad-input" data-tabid="glm-maiden-other"{/if}>
+            <input type="text" name="maiden_other" value="{$obit.fieldData.maiden_other}" class="glm-form-text-input-short">
+            {if $obit.fieldFail.maiden_other}<p>{$obit.fieldFail.maiden_other}</p><br>{/if}
+            </td>
+        </tr>
+        <tr>
+            <th {if $obit.fieldRequired.spouse_partner} class="glm-required"}{/if}>Spouse Partner</th>
+            <td {if $obit.fieldFail.spouse_partner}class="glm-form-bad-input" data-tabid="glm-spouse-partner"{/if}>
+            <input type="text" name="spouse_partner" value="{$obit.fieldData.spouse_partner}" class="glm-form-text-input-short">
+            {if $obit.fieldFail.spouse_partner}<p>{$obit.fieldFail.spouse_partner}</p>{/if}<br>
+            </td>
+        </tr>
+        <tr>
+            <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}">
+                        </div>
+                    </td>
+                    <td>
+                        <input type="checkbox" name="obit_article" > 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>
+                </table>
+                <div id="glm-obits-articleLarger_logo" class="glm-imageDialog">
+                    <img src="{$glmPluginMediaUrl}/images/large/{$obit.fieldData.obit_article}">
+                </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>
+        </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>
+        </tr>
+        <tr>
+            <th {if $obit.fieldRequired.newspaper} class="glm-required"}{/if}>Newspaper</th>
+            <td {if $obit.fieldFail.newspaper}class="glm-form-bad-input" data-tabid="glm-obits-newspaper"{/if}>
+            <input type="text" name="newspaper" value="{$obit.fieldData.newspaper}" class="glm-form-text-input-short">
+            {if $obit.fieldFail.newspaper}<p>{$obit.fieldFail.newspaper}</p>{/if}<br>
+            </td>
+        </tr>
+        <tr>
+            <th {if $obit.fieldRequired.newspaper_date} class="glm-required"}{/if}>Newspaper Date</th>
+            <td {if $obit.fieldFail.newspaper_date}class="glm-form-bad-input" data-tabid="glm-obits-newspaper-date"{/if}>
+            <input type="text" name="newspaper_date" value="{$obit.fieldData.newspaper_date}" class="glm-form-text-input-short">
+            {if $obit.fieldFail.newspaper_date}<p>{$obit.fieldFail.newspaper_date}</p>{/if}<br>
+            </td>
+        </tr>
+        <tr>
+            <th {if $obit.fieldRequired.father_name} class="glm-required"}{/if}>Father's Name</th>
+            <td {if $obit.fieldFail.father_name}class="glm-form-bad-input" data-tabid="glm-obits-father-name"{/if}>
+            <input type="text" name="father_name" value="{$obit.fieldData.father_name}" class="glm-form-text-input-short">
+            {if $obit.fieldFail.father_name}<p>{$obit.fieldFail.father_name}</p>{/if}<br>
+            </td>
+        </tr>
+        <tr>
+            <th {if $obit.fieldRequired.mother_name} class="glm-required"}{/if}>Mother's Name</th>
+            <td {if $obit.fieldFail.mother_name}class="glm-form-bad-input" data-tabid="glm-obits-mother-name"{/if}>
+            <input type="text" name="mother_name" value="{$obit.fieldData.mother_name}" class="glm-form-text-input-short">
+            {if $obit.fieldFail.mother_name}<p>{$obit.fieldFail.mother_name}</p>{/if}<br>
+            </td>
+        </tr>
+        <tr>
+            <th {if $obit.fieldRequired.misc_info} class="glm-required"}{/if}>Misc Info</th>
+            <td {if $obit.fieldFail.misc_info}class="glm-form-bad-input" data-tabid="glm-misc-info"{/if}>
+            <textarea name="misc_info" class="glm-form-textarea">{$obit.fieldData.misc_info}</textarea>
+            {if $obit.fieldFail.misc_info}
+                <p>{$obit.fieldFail.misc_info}</p>
+            {/if}<br>
+            </td>
+        </tr>
 
+    </table>
         <input id="updateObit" type="submit" value="{if $haveObit}Update Obit{else}Save New Obit{/if}">
 
     </form>
diff --git a/views/admin/obits/list.html b/views/admin/obits/list.html
index 043519b..e07b141 100644
--- a/views/admin/obits/list.html
+++ b/views/admin/obits/list.html
@@ -39,12 +39,7 @@
             <thead>
                 <tr>
                     <th>ID</th>
-                    <th>Obit Name</th>
-                    <th>{$terms.term_member_cap}</th>
-                    <th>Status</th>
-                    <th>First Date</th>
-                    <th>Last Date</th>
-                    <th></th>
+                    <th>Obit Last Name</th>
                 </tr>
             </thead>
             <tbody>
@@ -60,22 +55,7 @@
                         {$e.id}
                     </td>
                     <td class="glm-nowrap">
-                        <a href="{$thisUrl}?page={$thisPage}&glm_action=list&option=edit&obit={$e.id}">{$e.name}</a>
-                    </td>
-                    <td class="glm-nowrap">
-                        {$e.ref_dest}
-                    </td>
-                    <td class="glm-nowrap">
-                        {$e.status.name}
-                    </td>
-                    <td>
-                        {$e.firstDate}
-                    </td>
-                    <td>
-                        {$e.lastDate}
-                    </td>
-                    <td>
-                        <a href="{$siteBaseUrl}obit-detail/{$e.name_slug}/" target="_blank">View Obit</a>
+                        <a href="{$thisUrl}?page={$thisPage}&glm_action=list&option=edit&obit={$e.id}">{$e.last_name}</a>
                     </td>
                 </tr>
         {/foreach}
@@ -133,7 +113,7 @@
 
              var availableTags = [
     {foreach $namesList as $e}
-                { label: "{$e.name|replace:'"':"'"}", value: "{$e.name|replace:'"':"'"}", id: '{$e.id}' },
+                { label: "{$e.last_name|replace:'"':"'"}", value: "{$e.last_name|replace:'"':"'"}", id: '{$e.id}' },
     {/foreach}
              ];
 
-- 
2.17.1