From 16cf44fc08b295f882f61be3e2dc5c644ae8ecda Mon Sep 17 00:00:00 2001
From: Oliver Schneider <oli@student.ethz.ch>
Date: Mon, 9 May 2016 13:36:17 +0200
Subject: [PATCH] get event by ID
---
public/index.html | 2 +-
public/js/amivcore.js | 2 +-
public/js/main.js | 18 ++++++++++++------
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/public/index.html b/public/index.html
index 1dceead..878ed38 100644
--- a/public/index.html
+++ b/public/index.html
@@ -92,7 +92,7 @@
<div class="grid-item col-xs-12 col-sm-6 col-md-4 col-lg-3 col-xl-2">
<div class="card">
<p>
- <a data-chrome="noheader" class="twitter-timeline" href="https://twitter.com/AMIV_ETHZ/amiv" data-widget-id="389682176024784896">
+ <a data-chrome="noheader" class="twitter-timeline" href="https://twitter.com/AMIV_ETHZ/amiv" data-widget-id="389682176024784896" >
Tweets from @AMIV_ETHZ
</a>
</p>
diff --git a/public/js/amivcore.js b/public/js/amivcore.js
index 43633f8..f743d30 100644
--- a/public/js/amivcore.js
+++ b/public/js/amivcore.js
@@ -13,7 +13,7 @@
lib: {
//api_url: 'https://amiv-apidev.vsos.ethz.ch',
api_url: 'https://nicco.io/amiv',
- spec_url: 'lib/amiv/spec.json',
+ spec_url: '../admin/lib/amiv/spec.json',
//spec_url: 'https://nicco.io/amiv/docs/spec.json',
authenticated: false,
ready: false,
diff --git a/public/js/main.js b/public/js/main.js
index 332f368..737517b 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -8,6 +8,7 @@ function getEvents(callback) {
function addElement(item) {
$('.grid')
.append('<div class="grid-item col-xs-12 col-sm-6 col-md-4 col-lg-3 col-xl-2">' + item + '</div>');
+ loadJSEvents();
}
$(document).ready(function() {
@@ -63,17 +64,20 @@ function getEvents(callback) {
}
}
- addElement('<div class="card"><div class="card-image"><img class="img-responsive" src="'+item.img_banner+'"><date class="datum"><div class="month">'+month[datenum.getMonth()]+'</div><div class="day">'+datenum.getDate()+'</div><div class="starttime">'+datenum.getHours()+':'+minutes+'</div><date-overlay></date-overlay></date><span class="card-title">'+item.title_de+' @ '+item.location+'</span></div><div class="card-content" id="eDescription'+item.id+'">'+item.description_de+'</div><div class="card-action"><a href="#" target="new_blank" id="moreInfo" title="'+item.id+'">Info</a><a href="#" id="anmeldeSub" target="new_blank" data-toggle="modal" data-target="#anmeldeModal">'+register+'</a><a href="#" target="new_blank">Im Kalender speichern</a></div></div>');
+ addElement('<div class="card"><div class="card-image"><img class="img-responsive" src="'+item.img_banner+'"><date class="datum"><div class="month">'+month[datenum.getMonth()]+'</div><div class="day">'+datenum.getDate()+'</div><div class="starttime">'+datenum.getHours()+':'+minutes+'</div><date-overlay></date-overlay></date><span class="card-title">'+item.title_de+' @ '+item.location+'</span></div><div class="card-content" id="eDescription'+item.id+'">'+item.description_de+'</div><div class="card-action"><a href="javascript:void(0);" class="moreInfo" title="'+item.id+'">Info</a><a href="#" id="anmeldeSub" target="new_blank" data-toggle="modal" data-target="#anmeldeModal">'+register+'</a><a href="#" target="new_blank">Im Kalender speichern</a></div></div>');
});
});
});
-
-// Card Info Enfolding
- $('#moreInfo').on('click', function(){
- id_event=self.title;
+
+function loadJSEvents(){
+
+ $('.moreInfo, #anmeldeSub').off('click');
+ // Card Info Enfolding
+ $('.moreInfo').on('click', function(){
+ id_event=$(this).attr('title');
console.log(id_event);
amivcore.events.GET({
- id: $(this).attr('id_event')
+ id: id_event,
}, function(ret) {
curEventData = ret;
console.log(id_event);
@@ -83,6 +87,8 @@ function getEvents(callback) {
// Eventanmeldung
$('#anmeldeSub').on('click');
+
+}
// Login
$('#loginSubmit').on('click', function(){
--
GitLab