Projects/nettsiden
Projects
/
nettsiden
8
2
Fork 0
Code Issues 15 Pull Requests 2 Activity

Add brettspill, drift and hack activities #35

Merged
felixalbrigtsen merged 2 commits from 2023events into master 2023-01-16 16:26:02 +01:00
Conversation 0 Commits 2 Files Changed 3 +10 -11
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a734fe6bd3 - Show all commits

4
inc/include.php
View File

@ -27,8 +27,8 @@ use \pvv\side\Agenda;
$agenda = new \pvv\side\Agenda([ $agenda = new \pvv\side\Agenda([
// new \pvv\side\social\NerdepitsaActivity, // new \pvv\side\social\NerdepitsaActivity,
// new \pvv\side\social\AnimekveldActivity, // new \pvv\side\social\AnimekveldActivity,
// new \pvv\side\social\HackekveldActivity, new \pvv\side\social\HackekveldActivity,
// new \pvv\side\social\BrettspillActivity, new \pvv\side\social\BrettspillActivity,
new \pvv\side\social\DriftkveldActivity, new \pvv\side\social\DriftkveldActivity,
new \pvv\side\DBActivity($pdo), new \pvv\side\DBActivity($pdo),
]); ]);

9
src/pvv/side/social/brettspillactivity.php
View File

@ -11,9 +11,9 @@ class BrettspillActivity implements Activity {
if ($date->format('H') > 17 || $date->format('H') == 16 && $date->format('i') > 15) if ($date->format('H') > 17 || $date->format('H') == 16 && $date->format('i') > 15)
return $this->nextDate($date->add(new DateInterval('P1D'))->setTime(16, 15, 0)); return $this->nextDate($date->add(new DateInterval('P1D'))->setTime(16, 15, 0));
$date = $date->setTime(16, 15, 0); $date = $date->setTime(16, 15, 0);
if ($date->format('N') != 6) if ($date->format('N') != 7)
return $this->nextDate($date->add(new DateInterval('P1D'))); return $this->nextDate($date->add(new DateInterval('P1D')));
if ($date->format('W') % 4 - 3) if ($date->format('W') % 2 - 1)
return $this->nextDate($date->add(new DateInterval('P7D'))); return $this->nextDate($date->add(new DateInterval('P7D')));
return $date; return $date;
} }
@ -22,10 +22,9 @@ class BrettspillActivity implements Activity {
if ($date->format('H') < 16 || $date->format('H') == 17 && $date->format('i') < 15) if ($date->format('H') < 16 || $date->format('H') == 17 && $date->format('i') < 15)
return $this->prevDate($date->sub(new DateInterval('P1D'))->setTime(16, 15, 0)); return $this->prevDate($date->sub(new DateInterval('P1D'))->setTime(16, 15, 0));
$date = $date->setTime(16, 15, 0); $date = $date->setTime(16, 15, 0);
if ($date->format('N') != 6) if ($date->format('N') != 7)
return $this->prevDate($date->sub(new DateInterval('P1D'))); return $this->prevDate($date->sub(new DateInterval('P1D')));
if ($date->format('W') % 4 - 3)
return $this->nextDate($date->add(new DateInterval('P7D')));
return $date; return $date;
} }

4
src/pvv/side/social/driftkveldactivity.php
View File

@ -13,7 +13,7 @@ class DriftkveldActivity implements Activity {
$date = $date->setTime(18, 15, 0); $date = $date->setTime(18, 15, 0);
if ($date->format('N') != 6) if ($date->format('N') != 6)
return $this->nextDate($date->add(new DateInterval('P1D'))); return $this->nextDate($date->add(new DateInterval('P1D')));
if ($date->format('W') % 2) if ($date->format('W') % 2 - 1)
return $this->nextDate($date->add(new DateInterval('P7D'))); return $this->nextDate($date->add(new DateInterval('P7D')));
return $date; return $date;
} }
@ -24,7 +24,7 @@ class DriftkveldActivity implements Activity {
$date = $date->setTime(18, 15, 0); $date = $date->setTime(18, 15, 0);
if ($date->format('N') != 6) if ($date->format('N') != 6)
return $this->prevDate($date->sub(new DateInterval('P1D'))); return $this->prevDate($date->sub(new DateInterval('P1D')));
if ($date->format('W') % 2) if ($date->format('W') % 2 - 1)
return $this->prevDate($date->sub(new DateInterval('P7D'))); return $this->prevDate($date->sub(new DateInterval('P7D')));
return $date; return $date;
} }

4
src/pvv/side/social/hackekveldactivity.php
View File

@ -13,7 +13,7 @@ class HackekveldActivity implements Activity {
$date = $date->setTime(16, 15, 0); $date = $date->setTime(16, 15, 0);
if ($date->format('N') != 6) if ($date->format('N') != 6)
return $this->nextDate($date->add(new DateInterval('P1D'))); return $this->nextDate($date->add(new DateInterval('P1D')));
if ($date->format('W') % 4 - 1) if ($date->format('W') % 2)
return $this->nextDate($date->add(new DateInterval('P7D'))); return $this->nextDate($date->add(new DateInterval('P7D')));
return $date; return $date;
} }
@ -24,7 +24,7 @@ class HackekveldActivity implements Activity {
$date = $date->setTime(18, 15, 0); $date = $date->setTime(18, 15, 0);
if ($date->format('N') != 6) if ($date->format('N') != 6)
return $this->prevDate($date->sub(new DateInterval('P1D'))); return $this->prevDate($date->sub(new DateInterval('P1D')));
if ($date->format('W') % 4 - 1) if ($date->format('W') % 2)
return $this->prevDate($date->sub(new DateInterval('P7D'))); return $this->prevDate($date->sub(new DateInterval('P7D')));
return $date; return $date;
} }