Drift/pvv-nixos-config
Drift
/
pvv-nixos-config
16
4
Fork 1
Code Issues Pull Requests 6 Wiki Activity

Add PDO-activity for reading events from database.

This commit is contained in:
Yorin Anne De Jong 2016-08-18 22:43:32 +02:00
parent 2949aba2bb
commit 72b3a1f535
4 changed files with 92 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/pvv/side/agenda.php
View File

@ -15,30 +15,29 @@ class Agenda {
const THIS_MONTH = 3; const THIS_MONTH = 3;
const NEXT_MONTH = 4; const NEXT_MONTH = 4;
public function __construct() { public function __construct($activities) {
$this->activities = [ $this->activities = $activities;
new NerdepitsaActivity,
new AnimekveldActivity,
];
} }
public function getEventsBetween(DateTimeImmutable $from, DateTimeImmutable $to) { public function getEventsBetween(DateTimeImmutable $from, DateTimeImmutable $to) {
$results = [[], []]; $results = [];
do { for($i = 0; $i < sizeof($this->activities); $i++) {
$run = false; $result = [];
for($i = 0; $i < sizeof($this->activities); $i++) { do {
if (sizeof($results[$i])) { $run = false;
$date = end($results[$i])->getStop(); if (sizeof($result)) {
$date = end($result)->getStop();
} else { } else {
$date = $from; $date = $from;
} }
$next = $this->activities[$i]->getNextEventFrom($date); $next = $this->activities[$i]->getNextEventFrom($date);
if (isset($next) && $next->getStart() < $to) { if (isset($next) && $next->getStart() < $to) {
$results[$i][] = $this->activities[$i]->getNextEventFrom($date); $result[] = $this->activities[$i]->getNextEventFrom($date);
$run = true; $run = true;
} }
} } while ($run);
} while ($run); $results[] = $result;
}
$result = []; $result = [];
foreach($results as $a) foreach($a as $b) $result[] = $b; foreach($results as $a) foreach($a as $b) $result[] = $b;
usort($result, function($a, $b) { usort($result, function($a, $b) {

66
src/pvv/side/dbactivity.php Normal file
View File

@ -0,0 +1,66 @@
<?php
namespace pvv\side;
use \DateTimeImmutable;
use \PDO;
class DBActivity implements RepeatingActivity {
public function __construct($dsn, $username, $password) {
$this->pdo = new PDO($dsn, $username, $password);
$this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
}
public function getNextEventFrom(DateTimeImmutable $date) {
$query = 'SELECT name,start,stop,organiser,location 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';
return $this->retrieve($date, $query);
}
private function retrieve($date, $query) {
$stmt = $this->pdo->prepare($query);
$stmt->execute(['date' => $date->format('Y-m-d H:i:s')]);
if ($result = $stmt->fetch(PDO::FETCH_ASSOC)){
$ev = new OnceEvent(
$result['name'],
DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $result['start']),
DateTimeImmutable::createFromFormat('Y-m-d H:i:s', $result['stop']),
$result['organiser'],
$result['location']
);
return $ev;
}
return null;
}
public function getName() /* : string */ {
return "Database";
}
public function getLocation() /* : Location */ {
return "Location";
}
public function getOrganiser() /* : User */ {
return "User";
}
/*
public function getAllEvents(){
global $url, $user,$pass,$db;
$events = array();
$mysqli = new mysqli($url,$user,$pass,$db);
$result = $mysqli->query("SELECT name,start,stop,organiser,location FROM events");
while($row = $result->fetch_assoc()){
$ev = new OnceEvent($row['name'],$row['start'],$row['stop'],$row['organiser'],$row['location']);
array_push($events,$ev);
}
#array_sort($events);
return $events;
}
*/
}

4
src/pvv/side/onceevent.php
View File

@ -1,9 +1,9 @@
<?php <?php
namespace pvv\side; namespace pvv\side;
Class OnceEvent implements Event { Class OnceEvent extends Event {
private $name, $start, $end, $org, $loc; private $name, $start, $end, $org, $loc;
public function __construct($name,$start,$end,$org, $loc){ public function __construct($name,\DateTimeImmutable $start,\DateTimeImmutable $end,$org, $loc){
$this->name = $name; $this->name = $name;
$this->start = $start; $this->start = $start;
$this->end = $end; $this->end = $end;

13
www/index.php
View File

@ -1,4 +1,8 @@
<?php require '../src/_autoload.php'; date_default_timezone_set('Europe/Oslo') ?><!DOCTYPE html> <?php
require '../src/_autoload.php';
date_default_timezone_set('Europe/Oslo');
//include __DIR__.'/../sql_config.php';
?><!DOCTYPE html>
<html lang="no"> <html lang="no">
<title>Programvareverkstedet</title> <title>Programvareverkstedet</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@ -40,7 +44,12 @@
<?php $translation = ['i dag', 'i morgen', 'denne uka', 'denne måned', 'neste måned'] ?> <?php $translation = ['i dag', 'i morgen', 'denne uka', 'denne måned', 'neste måned'] ?>
<?php $counter1 = 0; ?> <?php $counter1 = 0; ?>
<?php $counter2 = 0; ?> <?php $counter2 = 0; ?>
<?php foreach((new \pvv\side\Agenda())->getNextDays() as $period => $events) if ($events && $counter1 < 2 && $counter2 < 10) { $counter1++ ?> <?php $agenda = new \pvv\side\Agenda([
new \pvv\side\social\NerdepitsaActivity,
new \pvv\side\social\AnimekveldActivity,
new \pvv\side\DBActivity('sqlite:../pvv.sqlite', null, null),
]); ?>
<?php foreach($agenda->getNextDays() as $period => $events) if ($events && $counter1 < 2 && $counter2 < 10) { $counter1++ ?>
<li><p><?= $translation[$period] ?> <span><?= reset($events)->getStart()->format('Y-m-d'); ?></span></p> <li><p><?= $translation[$period] ?> <span><?= reset($events)->getStart()->format('Y-m-d'); ?></span></p>
<ul> <ul>
<?php foreach($events as $event) { $counter2++ ?> <?php foreach($events as $event) { $counter2++ ?>