' + this.$i18n.get('info_date') + moment( item['creation_date'], 'YYYY-MM-DD').format('DD/MM/YYYY'); + return this.$i18n.get('info_created_by') + item['author_name'] + '
' + this.$i18n.get('info_date') + item['creation_date']; }, getDecodedURI(url) { return decodeURIComponent(url); diff --git a/src/admin/js/main.js b/src/admin/js/main.js index e4c8262cc..cc8232a8a 100644 --- a/src/admin/js/main.js +++ b/src/admin/js/main.js @@ -41,6 +41,7 @@ import store from '../../js/store/store' import router from './router' import eventBusSearch from '../../js/event-bus-search'; import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin } from './utilities'; +import VueMask from 'v-mask'; // Configure and Register Plugins Vue.use(Buefy); @@ -48,6 +49,7 @@ Vue.use(I18NPlugin); Vue.use(UserPrefsPlugin); Vue.use(RouterHelperPlugin); Vue.use(ConsolePlugin, {visual: false}); +Vue.use(VueMask); /* Fields */ Vue.component('tainacan-text', Text); diff --git a/src/admin/js/mixins.js b/src/admin/js/mixins.js index 693ee42e8..3259e1c13 100644 --- a/src/admin/js/mixins.js +++ b/src/admin/js/mixins.js @@ -29,6 +29,26 @@ export const wpAjax = { reject(error) }) }); + }, + getDatei18n(dateString){ + this.axiosWPAjax.post('', qs.stringify({ + action: 'tainacan_date_i18n', + date_string: dateString, + nonce: tainacan_plugin.nonce, + })).then(res => { + return res.data + }); + }, + } +}; + +export const dateInter = { + methods: { + getDateLocaleFormat() { + + let now = new Date(); + + return now.toLocaleDateString().replace(/[\d]/g, '#'); } } }; \ No newline at end of file diff --git a/src/admin/pages/lists/collections-page.vue b/src/admin/pages/lists/collections-page.vue index 64e541e6d..43c034e10 100644 --- a/src/admin/pages/lists/collections-page.vue +++ b/src/admin/pages/lists/collections-page.vue @@ -122,7 +122,7 @@ export default { collections(){ let collectionsList = this.getCollections(); for (let collection of collectionsList) - collection['creation'] = this.$i18n.get('info_created_by') + collection['author_name'] + '
' + this.$i18n.get('info_date') + moment(collection['creation_date'], 'YYYY-MM-DD').format('DD/MM/YYYY'); + collection['creation'] = this.$i18n.get('info_created_by') + collection['author_name'] + '
' + this.$i18n.get('info_date') + collection['creation_date']; return collectionsList; } }, diff --git a/src/admin/pages/singles/item-page.vue b/src/admin/pages/singles/item-page.vue index 934ee9e50..c7ed3ad2e 100644 --- a/src/admin/pages/singles/item-page.vue +++ b/src/admin/pages/singles/item-page.vue @@ -3,7 +3,7 @@
+ v-if="item.thumbnail"
+ class="media">
+ class="media-left">
-
+
@@ -42,36 +42,40 @@
+ v-for="(metadata, index) in item.metadata"
+ :key="index"
+ class="box">
+ v-if="metadata.date_i18n"
+ class="is-size-3"
+ v-html="metadata.date_i18n"/>
--
+ v-else-if="metadata.value_as_html" + class="is-size-3" + v-html="metadata.value_as_html"/> +--
- {{ metadata.name }} + {{ metadata.name }}
+ class="box">
@@ -89,52 +93,52 @@
diff --git a/src/api/endpoints/class-tainacan-rest-items-controller.php b/src/api/endpoints/class-tainacan-rest-items-controller.php
index e1d889746..21575c637 100644
--- a/src/api/endpoints/class-tainacan-rest-items-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-items-controller.php
@@ -106,6 +106,9 @@ class REST_Items_Controller extends REST_Controller {
$item_array['metadata'][ $slug ]['value'] = $item_metadata_array['value'];
$item_array['metadata'][ $slug ]['value_as_html'] = $item_metadata_array['value_as_html'];
$item_array['metadata'][ $slug ]['value_as_string'] = $item_metadata_array['value_as_string'];
+ if($field->get_field_type_object()->get_primitive_type() === 'date') {
+ $item_array['metadata'][ $slug ]['date_i18n'] = $item_metadata_array['date_i18n'];
+ }
$item_array['metadata'][ $slug ]['multiple'] = $field->get_multiple();
}
diff --git a/src/classes/entities/class-tainacan-collection.php b/src/classes/entities/class-tainacan-collection.php
index f197ffe4f..576408d62 100644
--- a/src/classes/entities/class-tainacan-collection.php
+++ b/src/classes/entities/class-tainacan-collection.php
@@ -68,10 +68,12 @@ class Collection extends Entity {
public function __toArray() {
$array_collection = parent::__toArray();
- $array_collection['thumbnail'] = $this->get_thumbnail();
- $array_collection['header_image'] = $this->get_header_image();
- $array_collection['author_name'] = $this->get_author_name();
- $array_collection['url'] = get_permalink( $this->get_id() );
+ $array_collection['thumbnail'] = $this->get_thumbnail();
+ $array_collection['header_image'] = $this->get_header_image();
+ $array_collection['author_name'] = $this->get_author_name();
+ $array_collection['url'] = get_permalink( $this->get_id() );
+ $array_collection['creation_date'] = $this->get_date_i18n( explode( ' ', $array_collection['creation_date'] )[0] );
+ $array_collection['modification_date'] = $this->get_date_i18n( explode( ' ', $array_collection['modification_date'] )[0] );
return $array_collection;
}
diff --git a/src/classes/entities/class-tainacan-entity.php b/src/classes/entities/class-tainacan-entity.php
index 5ae28337e..86cbfdfad 100644
--- a/src/classes/entities/class-tainacan-entity.php
+++ b/src/classes/entities/class-tainacan-entity.php
@@ -132,6 +132,18 @@ class Entity {
return $repository;
}
+ /**
+ * @param $date
+ *
+ * @return string
+ */
+ public function get_date_i18n($date){
+
+ $unix_time_stamp = strtotime($date);
+
+ return date_i18n(get_option('date_format'), $unix_time_stamp);
+ }
+
/**
* return the value for a mapped property
* @param string $prop id of property
diff --git a/src/classes/entities/class-tainacan-item-metadata-entity.php b/src/classes/entities/class-tainacan-item-metadata-entity.php
index 5972fef06..092b25d90 100644
--- a/src/classes/entities/class-tainacan-item-metadata-entity.php
+++ b/src/classes/entities/class-tainacan-item-metadata-entity.php
@@ -89,7 +89,7 @@ class Item_Metadata_Entity extends Entity {
}
-
+
/**
* Get the value as a plain text string
* @return string
@@ -142,6 +142,11 @@ class Item_Metadata_Entity extends Entity {
$as_array['value'] = $this->get_value_as_array();
$as_array['value_as_html'] = $this->get_value_as_html();
$as_array['value_as_string'] = $this->get_value_as_string();
+
+ if($this->get_field()->get_field_type_object()->get_primitive_type() === 'date'){
+ $as_array['date_i18n'] = $this->get_date_i18n($this->get_value_as_string());
+ }
+
$as_array['item'] = $this->get_item()->__toArray();
$as_array['field'] = $this->get_field()->__toArray();
diff --git a/src/classes/entities/class-tainacan-item.php b/src/classes/entities/class-tainacan-item.php
index bb5694feb..a7ca5c8e1 100644
--- a/src/classes/entities/class-tainacan-item.php
+++ b/src/classes/entities/class-tainacan-item.php
@@ -52,10 +52,12 @@ class Item extends Entity {
public function __toArray() {
$array_item = parent::__toArray();
- $array_item['thumbnail'] = $this->get_thumbnail();
- $array_item['_thumbnail_id'] = $this->get__thumbnail_id();
- $array_item['author_name'] = $this->get_author_name();
- $array_item['url'] = get_permalink( $this->get_id() );
+ $array_item['thumbnail'] = $this->get_thumbnail();
+ $array_item['_thumbnail_id'] = $this->get__thumbnail_id();
+ $array_item['author_name'] = $this->get_author_name();
+ $array_item['url'] = get_permalink( $this->get_id() );
+ $array_item['creation_date'] = $this->get_date_i18n( explode( ' ', $array_item['creation_date'] )[0] );
+ $array_item['modification_date'] = $this->get_date_i18n( explode( ' ', $array_item['modification_date'] )[0] );
return $array_item;
}
diff --git a/src/classes/field-types/date/Date.vue b/src/classes/field-types/date/Date.vue
index 1f2c6e569..d68e13b5d 100644
--- a/src/classes/field-types/date/Date.vue
+++ b/src/classes/field-types/date/Date.vue
@@ -1,23 +1,57 @@
-
+ v-if="attachments && attachments.length > 0">
+ v-for="(attachment, index) in attachments"
+ :key="index"
+ >
{{ attachment.guid.rendered }}
+ target="blank"
+ :href="attachment.guid.rendered">{{ attachment.guid.rendered }}
@@ -79,7 +83,7 @@
- {{ $i18n.get('label_attachments') }} + {{ $i18n.get('label_attachments') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+