franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Harmonize time fields v1

Browse Source
This commit is contained in:
Franzz
2026-04-18 08:57:32 +02:00
parent fcbb3d9d14
commit bcc5e9e0cd
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Spot.php
View File

@@ -397,17 +397,13 @@ class Spot extends Main
$asMedias = $this->oMedia->getMediasInfo($asConstraints); $asMedias = $this->oMedia->getMediasInfo($asConstraints);
foreach($asMedias as &$asMedia) { foreach($asMedias as &$asMedia) {
$iTimeStampTakenOn = strtotime($asMedia['taken_on']);
$iTimeStampPostedOn = strtotime($asMedia['posted_on']);
$asMedia['taken_on_formatted'] = $this->getTimeFormat($iTimeStampTakenOn);
$asMedia['taken_on_formatted_local'] = $this->getTimeFormat($iTimeStampTakenOn, $asMedia['timezone']);
$asMedia['taken_on_formatted_day_offset'] = self::getTimeZoneDayOffset($iTimeStampTakenOn, $asMedia['timezone']);
$asMedia['posted_on_formatted'] = $this->getTimeFormat($iTimeStampPostedOn);
$asMedia['posted_on_formatted_local'] = $this->getTimeFormat($iTimeStampPostedOn, $asMedia['timezone']);
$asMedia['posted_on_formatted_day_offset'] = self::getTimeZoneDayOffset($iTimeStampPostedOn, $asMedia['timezone']);
$asMedia['displayed_id'] = $asMedia[Db::getId(Media::MEDIA_TABLE)]; $asMedia['displayed_id'] = $asMedia[Db::getId(Media::MEDIA_TABLE)];
$this->addTimeStamp($asMedia, strtotime($asMedia[$sTimeRefField]), $asMedia['timezone']); $this->addTimeStamp($asMedia, strtotime($asMedia[$sTimeRefField]), $asMedia['timezone']);
$this->addTimeStamp($asMedia, strtotime($asMedia['taken_on']), $asMedia['timezone'], 'taken_on');
$this->addTimeStamp($asMedia, strtotime($asMedia['posted_on']), $asMedia['timezone'], 'posted_on');
unset($asMedia['taken_on']);
unset($asMedia['posted_on']);
} }
return $asMedias; return $asMedias;
@@ -439,14 +435,16 @@ class Spot extends Main
return $asPosts; return $asPosts;
} }
private function addTimeStamp(&$asData, $iTime, $sTimeZone='') { private function addTimeStamp(&$asData, $iTime, $sTimeZone='', $sPrefix='') {
$asData['unix_time'] = (int) $iTime; if($sPrefix != '') $sPrefix = $sPrefix.'_';
$asData['relative_time'] = Toolbox::getDateTimeDesc($iTime, $this->oLang->getLanguage());
$asData['formatted_time'] = $this->getTimeFormat($iTime); $asData[$sPrefix.'unix_time'] = (int) $iTime;
$asData[$sPrefix.'relative_time'] = Toolbox::getDateTimeDesc($iTime, $this->oLang->getLanguage());
$asData[$sPrefix.'formatted_time'] = $this->getTimeFormat($iTime);
if($sTimeZone != '') { if($sTimeZone != '') {
$asData['formatted_time_local'] = $this->getTimeFormat($iTime, $sTimeZone); $asData[$sPrefix.'formatted_time_local'] = $this->getTimeFormat($iTime, $sTimeZone);
$asData['day_offset'] = self::getTimeZoneDayOffset($iTime, $sTimeZone); $asData[$sPrefix.'day_offset'] = self::getTimeZoneDayOffset($iTime, $sTimeZone);
} }
} }

4
src/components/projectMediaLink.vue
View File

@@ -58,10 +58,10 @@ export default {
<spotIcon :icon="'post'" :classes="'fa-lg fa-fw push'" :text-classes="'comment-text'" :text="options.comment" /> <spotIcon :icon="'post'" :classes="'fa-lg fa-fw push'" :text-classes="'comment-text'" :text="options.comment" />
</span> </span>
<span ref="postedon" class="lb-caption-line"> <span ref="postedon" class="lb-caption-line">
<projectRelTime :icon="'upload'" :localTime="options.posted_on_formatted_local" :siteTime="options.posted_on_formatted" :offset="options.posted_on_formatted_day_offset" /> <projectRelTime :icon="'upload'" :localTime="options.posted_on_formatted_time_local" :siteTime="options.posted_on_formatted_time" :offset="options.posted_on_day_offset" />
</span> </span>
<span ref="takenon" class="lb-caption-line"> <span ref="takenon" class="lb-caption-line">
<projectRelTime :icon="options.subtype+'-shot'" :localTime="options.taken_on_formatted_local" :siteTime="options.taken_on_formatted" :offset="options.taken_on_formatted_day_offset" /> <projectRelTime :icon="options.subtype+'-shot'" :localTime="options.taken_on_formatted_time_local" :siteTime="options.taken_on_formatted_time" :offset="options.taken_on_day_offset" />
</span> </span>
</div> </div>
</template> </template>

10
src/scripts/page.project.js
View File

@@ -1083,7 +1083,7 @@ export default class Project {
} }
getMediaLink(asData, sType) { getMediaLink(asData, sType) {
var bTimeDiff = (asData.posted_on_formatted && asData.posted_on_formatted_local != asData.posted_on_formatted); var bTimeDiff = (asData.posted_on_formatted_time && asData.posted_on_formatted_time_local != asData.posted_on_formatted_time);
var $Comment = (!asData.comment || asData.comment == '')?'': var $Comment = (!asData.comment || asData.comment == '')?'':
$('<span>', {'class': 'lb-caption-line comment desktop', 'title': asData.comment}) $('<span>', {'class': 'lb-caption-line comment desktop', 'title': asData.comment})
@@ -1091,14 +1091,14 @@ export default class Project {
.append($('<span>', {'class':'comment-text'}).text(asData.comment)); .append($('<span>', {'class':'comment-text'}).text(asData.comment));
var $PostedOn = var $PostedOn =
$('<span>', {'class': 'lb-caption-line', title: bTimeDiff?this.spot.lang('local_time', asData.posted_on_formatted_local):''}) $('<span>', {'class': 'lb-caption-line', title: bTimeDiff?this.spot.lang('local_time', asData.posted_on_formatted_time_local):''})
.addIcon('fa-upload fa-lg fa-fw', true) .addIcon('fa-upload fa-lg fa-fw', true)
.append(asData.posted_on_formatted); .append(asData.posted_on_formatted_time);
var $TakenOn = (asData.taken_on == asData.posted_on)?'': var $TakenOn = (asData.taken_on == asData.posted_on)?'':
$('<span>', {'class': 'lb-caption-line', title: bTimeDiff?this.spot.lang('local_time', asData.taken_on_formatted_local):''}) $('<span>', {'class': 'lb-caption-line', title: bTimeDiff?this.spot.lang('local_time', asData.taken_on_formatted_time_local):''})
.addIcon('fa-'+asData.subtype+'-shot fa-lg fa-fw', true) .addIcon('fa-'+asData.subtype+'-shot fa-lg fa-fw', true)
.append(asData.taken_on_formatted); .append(asData.taken_on_formatted_time);
var $Title = $('<div>') var $Title = $('<div>')
.append($Comment) .append($Comment)