Read kurs from database.
This commit is contained in:
@@ -11,12 +11,12 @@ class DBActivity implements Activity {
|
||||
}
|
||||
|
||||
public function getNextEventFrom(DateTimeImmutable $date) {
|
||||
$query = 'SELECT name,start,stop,organiser,location FROM events WHERE start > :date ORDER BY start ASC LIMIT 1';
|
||||
$query = 'SELECT name,start,stop,organiser,location,description FROM events WHERE start > :date ORDER BY start ASC LIMIT 1';
|
||||
return $this->retrieve($date, $query);
|
||||
}
|
||||
|
||||
public function getPreviousEventFrom(DateTimeImmutable $date) {
|
||||
$query = 'SELECT name,start,stop,organiser,location FROM events WHERE start < :date ORDER BY start DESC LIMIT 1';
|
||||
$query = 'SELECT name,start,stop,organiser,location,description FROM events WHERE start < :date ORDER BY start DESC LIMIT 1';
|
||||
return $this->retrieve($date, $query);
|
||||
}
|
||||
|
||||
@@ -29,23 +29,12 @@ class DBActivity implements Activity {
|
||||
DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $result['start']),
|
||||
DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $result['stop']),
|
||||
$result['organiser'],
|
||||
$result['location']
|
||||
$result['location'],
|
||||
$result['description']
|
||||
);
|
||||
return $ev;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public function getName() /* : string */ {
|
||||
return "Database";
|
||||
}
|
||||
|
||||
public function getLocation() /* : Location */ {
|
||||
return "Location";
|
||||
}
|
||||
|
||||
public function getOrganiser() /* : User */ {
|
||||
return "User";
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -5,12 +5,13 @@ class SimpleEvent extends Event {
|
||||
|
||||
private $name, $start, $end, $org, $loc;
|
||||
|
||||
public function __construct($name,\DateTimeImmutable $start,\DateTimeImmutable $end,$org, $loc){
|
||||
public function __construct($name,\DateTimeImmutable $start,\DateTimeImmutable $end,$org, $loc, $descr){
|
||||
$this->name = $name;
|
||||
$this->start = $start;
|
||||
$this->end = $end;
|
||||
$this->org = $org;
|
||||
$this->log = $loc;
|
||||
$this->loc = $loc;
|
||||
$this->descr = explode("\n", $descr);
|
||||
}
|
||||
|
||||
public function getStart(){
|
||||
@@ -42,7 +43,7 @@ class SimpleEvent extends Event {
|
||||
}
|
||||
|
||||
public function getDescription() {
|
||||
return [];
|
||||
return $this->descr;
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user