diff --git a/src/webapp/src/components/sideCartView.vue b/src/webapp/src/components/sideCartView.vue
new file mode 100644
index 0000000..1c5f608
--- /dev/null
+++ b/src/webapp/src/components/sideCartView.vue
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/src/webapp/src/views/admin/EventsView.vue b/src/webapp/src/views/admin/EventsView.vue
index f666ff8..585fa86 100644
--- a/src/webapp/src/views/admin/EventsView.vue
+++ b/src/webapp/src/views/admin/EventsView.vue
@@ -112,7 +112,7 @@
sortable.push( [ this.events[ event ][ 'eventID' ], new Date( this.events[ event ][ 'date' ] ).getTime() ] );
}
sortable.sort( function( a, b ) {
- return a[ 1 ] - b [ 1 ];
+ return a[ 1 ] - b[ 1 ];
} );
for ( let element in sortable ) {
diff --git a/src/webapp/src/views/admin/events/AnalyticsView.vue b/src/webapp/src/views/admin/events/AnalyticsView.vue
index 54dd138..b975b19 100644
--- a/src/webapp/src/views/admin/events/AnalyticsView.vue
+++ b/src/webapp/src/views/admin/events/AnalyticsView.vue
@@ -11,6 +11,7 @@
Event analytics
Get insights into tickets sold, people checked in, available tickets, revenue, etc, in real time!
-
+
+
\ No newline at end of file
diff --git a/src/webapp/src/views/purchasing/OrderView.vue b/src/webapp/src/views/purchasing/OrderView.vue
index 3d59f8a..4dba6cd 100644
--- a/src/webapp/src/views/purchasing/OrderView.vue
+++ b/src/webapp/src/views/purchasing/OrderView.vue
@@ -12,7 +12,7 @@
Order tickets
- -
+
-
{{ event.name }}
@@ -20,7 +20,7 @@
Free seats: {{ event.freeSeats }} / {{ event.maxSeats }}
-
{{ event.location }}, {{ event.date }}
+
{{ event.location }}, {{ event.dateString }}
Starting at {{ event.currency }} {{ event.startingPrice }}
@@ -95,9 +95,25 @@
},
data () {
return {
- events: { 'test':{ 'name': 'TestEvent', 'description': 'This is a description for the TestEvent to test multiline support and proper positioning of the Fields', 'freeSeats': 2, 'maxSeats': 2, 'date':'TestDate', 'startingPrice':15, 'location': 'TestLocation', 'eventID': 'test', 'currency': 'CHF', 'logo': new URL( '/src/assets/logo.png', import.meta.url ).href }, 'test2':{ 'name': 'TestEvent2', 'description': 'This is a description for the TestEvent to test multiline support and proper positioning of the Fields', 'freeSeats': 2, 'maxSeats': 2, 'date':'TestDate', 'startingPrice':15, 'location': 'TestLocation', 'eventID': 'test2', 'currency': 'CHF', 'logo': new URL( '/src/assets/logo.png', import.meta.url ).href } }
+ events: { 'test':{ 'name': 'TestEvent', 'description': 'This is a description for the TestEvent to test multiline support and proper positioning of the Fields', 'freeSeats': 2, 'maxSeats': 2, 'date':'2023-07-20T09:00:00Z', 'startingPrice':15, 'location': 'TestLocation', 'eventID': 'test', 'currency': 'CHF', 'logo': new URL( '/src/assets/logo.png', import.meta.url ).href, 'dateCode': 10 }, 'test2':{ 'name': 'TestEvent2', 'description': 'This is a description for the TestEvent to test multiline support and proper positioning of the Fields', 'freeSeats': 2, 'maxSeats': 2, 'date':'2023-08-01T09:00:00Z', 'startingPrice':15, 'location': 'TestLocation', 'eventID': 'test2', 'currency': 'CHF', 'logo': new URL( '/src/assets/logo.png', import.meta.url ).href, 'dateCode': 5 } },
+ today: new Date().getTime()
}
- }
+ },
+ computed: {
+ orderedEvents () {
+ let sorted = Object.keys( this.events ).sort( ( a, b ) => {
+ return this.events[ a ].dateCode - this.events[ b ].dateCode;
+ } );
+ let rt = {};
+ for ( let element in sorted ) {
+ if ( new Date( this.events[ sorted[ element ] ].date ) > this.today ) {
+ rt[ sorted[ element ] ] = this.events[ sorted[ element ] ];
+ rt[ sorted[ element ] ][ 'dateString' ] = new Date( rt[ sorted[ element ] ][ 'date' ] ).toLocaleString();
+ }
+ }
+ return rt;
+ }
+ },
};