From: Steve Sutton Date: Tue, 3 Apr 2018 17:29:24 +0000 (-0400) Subject: adding files and images and dow to exports X-Git-Tag: v1.6.78^2~3^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1b475d467cb0610f9b28960a41ebf33191ebea5a;p=WP-Plugins%2Fglm-member-db-events.git adding files and images and dow to exports Add files 1 t o3 Add image Add Days of Week to export --- diff --git a/models/admin/ajax/eventsListExport.php b/models/admin/ajax/eventsListExport.php index a0e0223..487f42d 100644 --- a/models/admin/ajax/eventsListExport.php +++ b/models/admin/ajax/eventsListExport.php @@ -90,6 +90,7 @@ class GlmMembersAdmin_ajax_eventsListExport extends GlmDataEvents $success = false; $filterPending = false; $filterArchived = false; + $filterFeatured = false; $haveFilter = false; $numbDisplayed = false; $lastDisplayed = false; @@ -105,11 +106,18 @@ class GlmMembersAdmin_ajax_eventsListExport extends GlmDataEvents 'exportId' => $this->checkFlag('exportId'), 'exportName' => $this->checkFlag('exportName'), 'exportMember' => $this->checkFlag('exportMember'), + 'exportStarting' => $this->checkFlag('exportStarting'), + 'exportEnding' => $this->checkFlag('exportEnding'), + 'exportDaysow' => $this->checkFlag('exportDaysow'), 'exportStatus' => $this->checkFlag('exportStatus'), 'exportFeatured' => $this->checkFlag('exportFeatured'), 'exportCategories' => $this->checkFlag('exportCategories'), 'exportIntro' => $this->checkFlag('exportIntro'), 'exportDescr' => $this->checkFlag('exportDescr'), + 'exportImage' => $this->checkFlag('exportImage'), + 'exportFile1' => $this->checkFlag('exportFile1'), + 'exportFile2' => $this->checkFlag('exportFile2'), + 'exportFile3' => $this->checkFlag('exportFile3'), 'exportFree' => $this->checkFlag('exportFree'), 'exportCost' => $this->checkFlag('exportCost'), 'exportNotes' => $this->checkFlag('exportNotes'), @@ -243,10 +251,11 @@ class GlmMembersAdmin_ajax_eventsListExport extends GlmDataEvents $category_data = $this->wpdb->get_results( $sql, ARRAY_A ); // Get a current list of events without paging - $orderBy = "(select min(start_time) FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times WHERE T.id = event),name"; - $this->postCategories = true; - $this->postAddLocations = true; - $this->postAddTimes = true; + $orderBy = "(select min(start_time) FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times WHERE T.id = event),name"; + $this->postCategories = true; + $this->postAddLocations = true; + $this->postAddTimes = true; + $this->postAddRecurrences = true; $list = $this->getList( $where, $orderBy, true ); @@ -283,7 +292,9 @@ class GlmMembersAdmin_ajax_eventsListExport extends GlmDataEvents 'nextStart' => $nextStart, 'start' => $start, 'limit' => $limit, - 'namesList' => $namesList + 'namesList' => $namesList, + 'imageBaseUrl' => '', + 'fileBaseUrl' => '', ); $view = 'admin/ajax/eventsListExport.html'; diff --git a/views/admin/ajax/eventsListExport.html b/views/admin/ajax/eventsListExport.html index 14f41d7..fffa26c 100644 --- a/views/admin/ajax/eventsListExport.html +++ b/views/admin/ajax/eventsListExport.html @@ -4,7 +4,7 @@ Total found: {$memberCount} - List of {$terms.term_member_cap} Profiles + List of Events
@@ -14,11 +14,16 @@ {if $select.exportName}{/if} {if $select.exportMember}{/if} {if $select.exportStatus}{/if} - - + {if $select.exportStarting}{/if} + {if $select.exportEnding}{/if} + {if $select.exportDaysow}{/if} {if $select.exportFeatured}{/if} {if $select.exportIntro}{/if} {if $select.exportDescr}{/if} + {if $select.exportImage}{/if} + {if $select.exportFile1}{/if} + {if $select.exportFile2}{/if} + {if $select.exportFile3}{/if} {if $select.exportFree}{/if} {if $select.exportNotes}{/if} {if $select.exportLocationName}{/if} @@ -55,11 +60,16 @@ {if $select.exportName}{/if} {if $select.exportMember}{/if} {if $select.exportStatus}{/if} - - + {if $select.exportStarting}{/if} + {if $select.exportEnding}{/if} + {if $select.exportDaysow}{/if} {if $select.exportFeatured}{/if} {if $select.exportIntro}{/if} {if $select.exportDescr}{/if} + {if $select.exportImage}{/if} + {if $select.exportFile1}{/if} + {if $select.exportFile2}{/if} + {if $select.exportFile3}{/if} {if $select.exportFree}{/if} {if $select.exportNotes}{/if} diff --git a/views/admin/ajax/eventsListExportCsv.html b/views/admin/ajax/eventsListExportCsv.html index 75c0b9c..82578eb 100644 --- a/views/admin/ajax/eventsListExportCsv.html +++ b/views/admin/ajax/eventsListExportCsv.html @@ -2,9 +2,17 @@ {if $select.exportId}"ID",{/if} {if $select.exportName}"Event Name",{/if} {if $select.exportMember}"{$terms.term_member_cap} Name",{/if} -{if $select.exportStatus}"Status",{/if} "Starting Date", "Ending Date", {if $select.exportFeatured}"Featured",{/if} +{if $select.exportStatus}"Status",{/if} +{if $select.exportStarting}"Starting Date",{/if} +{if $select.exportEnding}"Ending Date",{/if} +{if $select.exportDaysow}"Days of Week",{/if} +{if $select.exportFeatured}"Featured",{/if} {if $select.exportIntro}"Intro",{/if} {if $select.exportDescr}"Description",{/if} +{if $select.exportImage}"Image",{/if} +{if $select.exportFile1}"File 1",{/if} +{if $select.exportFile2}"File 2",{/if} +{if $select.exportFile3}"File 3",{/if} {if $select.exportFree}"Free",{/if} {if $select.exportNotes}"Notes",{/if} {if $select.exportLocationName}"Location Name",{/if} @@ -30,9 +38,17 @@ {if $select.exportId}"{$event.id}",{/if} {if $select.exportName}"{$event.name}",{/if} {if $select.exportMember}"{$event.ref_dest}",{/if} -{if $select.exportStatus}"{$event.status.name}",{/if} "{$event.starting_date}", "{$event.ending_date}", {if $select.exportFeatured}"{$event.featured.name}",{/if} +{if $select.exportStatus}"{$event.status.name}",{/if} +{if $select.exportStarting}"{$event.starting_date}",{/if} +{if $select.exportEnding}"{$event.ending_date}",{/if} +{if $select.exportDaysow}"{if $event.recurrences.0.recurring.value}{foreach $event.recurrences.0.day_of_week.names as $dow}{$dow} {/foreach}{/if}",{/if} +{if $select.exportFeatured}"{$event.featured.name}",{/if} {if $select.exportIntro}"{$event.intro}",{/if} {if $select.exportDescr}"{$event.descr}",{/if} +{if $select.exportImage}"{if $event.image}{$glmPluginMediaUrl}/images/original/{$event.image}{/if}",{/if} +{if $select.exportFile1}"{if $event.file1}{$glmPluginMediaUrl}/files/{$event.file1}{/if}",{/if} +{if $select.exportFile2}"{if $event.file2}{$glmPluginMediaUrl}/files/{$event.file2}{/if}",{/if} +{if $select.exportFile3}"{if $event.file3}{$glmPluginMediaUrl}/files/{$event.file3}{/if}",{/if} {if $select.exportFree}"{$event.free}",{/if} {if $select.exportNotes}"{$event.notes}",{/if} {if $select.exportLocationName}"{if $event.locations.name}{$event.locations.name}{/if}",{/if} diff --git a/views/admin/events/eventExportModal.html b/views/admin/events/eventExportModal.html index f665d1d..d4a83ff 100644 --- a/views/admin/events/eventExportModal.html +++ b/views/admin/events/eventExportModal.html @@ -45,16 +45,23 @@ Account ID
Event Name
{$terms.term_member_cap} Name
+ Start Date
+ End Date
+ Days of Week
Status
Featured
Categories
Intro
Description
+ Image
+ File 1
+ + - + -

Event Name	{$terms.term_member_cap} Name	Status	Starting Date	Ending Date	Starting Date	Ending Date	Days of Week	Featured	Intro	Description	Image	File 1	File 2	File 3	Free	Notes	Location Name	{$event.name}	{$event.ref_dest}	{$event.status.name}	{$event.starting_date}	{$event.ending_date}	{$event.starting_date}	{$event.ending_date}	{if $event.recurrences.0.recurring.value}{foreach $event.recurrences.0.day_of_week.names as $dow}{$dow} {/foreach}{/if}	{$event.featured.name}	{$event.intro}	{$event.descr}	{if $event.image}{$glmPluginMediaUrl}/images/original/{$event.image}{/if}	{if $event.file1}{$glmPluginMediaUrl}/files/{$event.file1}{/if}	{if $event.file2}{$glmPluginMediaUrl}/files/{$event.file2}{/if}	{if $event.file3}{$glmPluginMediaUrl}/files/{$event.file3}{/if}	{$event.free.name}	{$event.notes}	+ File 2 + File 3 Free Cost Notes -	Location Name Address City @@ -62,11 +69,11 @@ ZIP / Postal Code Country Region +	Web URL Ticketing URL Registration URL -	Contact Name Contact Phone Contact Email @@ -74,7 +81,6 @@ Admin Contact Organization Admin Contact Email Admin Contact Phone -