marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wkParticipo' of /media/marko/mmcblk0p1-mmc-USD00_0x62b76940/gitReops/cwsvJudo into wkParticipo

Browse Source
This commit is contained in:
marko
2021-06-13 07:58:11 +02:00
parent de4bd78249 7486a9e886
commit eaca82be64
10 changed files with 484 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
homepage/wkParticipo/addEvent.php
View File

@@ -54,8 +54,14 @@
<?php endif; ?>
<fieldset>
<legend>Benutzerdaten</legend>
<div><label for="wkId">wkId</label> <input type="text" name="f[wkId]" id="wkId"<?php echo isset($_POST['f']['wkId']) ? ' value="' . htmlspecialchars($_POST['f']['wkId']) . '"' : '' ?> /></div>
<div><label for="meldefrist">meldefrist</label> <input type="text" name="f[meldefrist]" id="meldefrist" <?php echo isset($_POST['f']['meldefrist']) ? ' value="' . htmlspecialchars($_POST['f']['meldefrist']) . '"' : '' ?> /></div>
<div>
<label for="wkId">wkId</label>
<input type="text" name="f[wkId]" id="wkId"<?php echo isset($_POST['f']['wkId']) ? ' value="' . htmlspecialchars($_POST['f']['wkId']) . '"' : '' ?> />
</div>
<div>
<label for="meldefrist">meldefrist</label>
<input type="text" name="f[meldefrist]" id="meldefrist" <?php echo isset($_POST['f']['meldefrist']) ? ' value="' . htmlspecialchars($_POST['f']['meldefrist']) . '"' : '' ?> />
</div>
</fieldset>
<fieldset>
<div><input type="submit" name="submit" value="Erstellen" /></div>

9
homepage/wkParticipo/admin/index.php
View File

@@ -15,10 +15,11 @@
<body>
<?php echo $login_status; ?>
<h1>Inhalt</h1>
<p><a href="./register.php">Neuen Benutzer anlegen.</a></p>
<p><a href="./addEvent.php">Neuen Event anlegen.</a></p>
<p><a href="./listUsers.php">User anzeigen.</a></p>
<p><a href="./listEvents.php">Events anzeigen.</a></p>
<p><a href="./register.php">Neuen Benutzer anlegen</a></p>
<p><a href="./addEvent.php">Neuen Event anlegen</a></p>
<p><a href="./listUsers.php">User anzeigen</a></p>
<p><a href="./listEvents.php">Events anzeigen</a></p>
<p><a href="./newsLetter.php?sendNewsletter">Newsletter manuel senden</a></p>
<p><a href="<?php echo( $baseUrl."/lib/wkParticipo-userAttribute.php");?>">Attribute verteilen</a></p>
</body>
</html>

9
homepage/wkParticipo/admin/listEvents.php
View File

@@ -25,7 +25,8 @@
echo $message['error']; die();
}
$eventList = getAllEvents($mysqli);
// $eventList = getAllEvents($mysqli);
$eventList = getCommingWkEvents($mysqli);
foreach($eventList as $event){
// $wkData = getWkData($mysqli, $event['wkId']);
$wkData = getWkEventData($mysqli, $event['id']);
@@ -49,12 +50,6 @@
}
?>
</ul>
<!--Beginn der Einbindung des Counters-->
<?php
$chCounter_page_title = "Wettkampfplanung - Administration - eventList";
$chCounter_visible=0;
//include( $_SERVER['DOCUMENT_ROOT'].'/expCounter/counter.php');?>
</body>
</html>

8
homepage/wkParticipo/admin/showUser.php
View File

@@ -3,9 +3,12 @@
require_once('../auth.php');
require_once('../local/db.php.inc');
require_once('../lib/wkParticipoLib.inc.php');
require_once('../lib/wkParticipo-user.php');
$message = array();
$eventData = array();
$user = new participo\user();
if(empty($_POST)){
$message['error'] = "Fehler: leeres POST!";
@@ -16,6 +19,11 @@
}
else{
if( (string)(int)$_POST['f']['userId'] == $_POST['f']['userId'] ){
$user->loadFromDb(getCwsvJudoDbConn(), $_POST['f']['userId']);
var_dump($_POST);
var_dump($user);
var_dump($user->toAssoc());
$mysqli = @new mysqli($db_server, $db_user, $db_password, $db_name);
if ($mysqli->connect_error) {
$message['error'] = 'Datenbankverbindung fehlgeschlagen: ' . $mysqli->connect_error;

7
homepage/wkParticipo/index.php
View File

@@ -72,11 +72,8 @@ return $ret;
<nav class="navBar">
<ul>
<<<<<<< Updated upstream
=======
<li><a href="/machs">Achievementsystem</a></li>
<li><a href="./infoZettel.php">Infozettel</a></li>
>>>>>>> Stashed changes
<li>
<a href ="./eventKalender.php">alle geplanten Wettkämpfe als Liste</a>
</li>
@@ -134,7 +131,6 @@ return $ret;
}
else{
foreach($wkEventData as $wkEvent){
// var_dump($wkEvent);
?>
<div class="wkInfoCard">
<time class="wkInfoCardDate" datetime="<?php echo( $wkEvent['date'] );?>">
@@ -241,14 +237,11 @@ return $ret;
<?php
}
else{
// var_dump($wkEvents);
foreach( $wkEvents as $wk){
//print_r($wk);
$wkEvent = getWkEventData($mysqlConn, $wk['id'], array('outCharset'=>"UTF-8"));
?>
<h3><?php echo( $wkEvent['Veranstaltung'] );?></h3>
<?php
//var_dump($wkEvent);
echo(
htmlWkEvent(
$wkEvent,

55
homepage/wkParticipo/lib/wkParticipo-user.php Normal file
View File

@@ -0,0 +1,55 @@
<?php
namespace participo;
$basePath = "/users/cwsvjudo/www";
require_once($basePath."/ressourcen/phpLib/cwsvJudo/miscAssis.php");
require_once($basePath."/config/cwsvJudo.config.php");
class user{
public $id;
public $loginName;
public $name;
public $vorname;
public $gebDatum;
public $eMail;
/// Setzen aller Attribute
/// @todo Inputvalidation
function set($userData){
$this->id = $userData["id"];
$this->loginName = $userData["loginName"];
$this->name = $userData["name"];
$this->vorname = $userData["vorname"];
$this->gebDatum = $userData["gebDatum"];
$this->eMail = $userData["eMail"];
return;
}
function toAssoc(){
return array(
"id" => $this->id,
"loginName"=> $this->loginName,
"name" => $this->name,
"vorname" => $this->vorname,
"gebDatum" => $this->gebDatum,
"eMail" => $this->eMail);
}
function loadFromDb($dbConn, $id){
$this->set(
loadUserDataFromDb($dbConn, $id)
);
}
}
/// request user from db via id
/// return user as assoziative array
function loadUserDataFromDb($dbConn, $userId){
return
dbQuery(
$dbConn,
"SELECT * FROM `wkParticipo_Users` WHERE id = :userId;",
array(
":userId"=>array('value'=>(int)$userId, 'data_type'=>\PDO::PARAM_INT)
)
)[0];
}
?>

45
homepage/wkParticipo/lib/wkParticipo-userAttribute.php
View File

@@ -27,6 +27,23 @@ $ret = "";
return $ret;
}
function arrayKeyed2htmlTableString($anArray, $keyList){
$ret = "";
if( !is_array($anArray) )
return "";
$ret .= "<table>";
foreach($anArray as $row){
if( !is_array($anArray) )
continue;
$ret .= "<tr>";
foreach( $keyList as $key )
$ret .= "<td>".$row[$key]."</td>";
$ret .= "</tr>";
}
$ret .= "</table>";
return $ret;
}
/// einem User ein Attribut zuordnen
///
/// @param $aDbConnection PDO-Datenbankverbindung, die benutzt werden soll
@@ -185,13 +202,37 @@ $userAttributes =
<?php echo(array2htmlTableString($userAttributes));?>
<?php
foreach($userAttributes as $userAttribute){
echo("<h2>".$userAttribute["name"]."</h2>");
// get the users with the attribute by a cross join
// remark: there are two id-columns, from which one gets lost (the one from the user) in the phpArray.
// so we (have to) use the userId from the attribute
// in short attributed => userId, unattributed => id (is the id of the user)
$attributedUsers =
dbQuery(
$dbConn,
"SELECT * FROM wkParticipo_Users, `wkParticipo_user<=>userAttributes` WHERE wkParticipo_Users.id = `wkParticipo_user<=>userAttributes`.userId AND `wkParticipo_user<=>userAttributes`.attributeId=:attributeId;",
"SELECT * FROM wkParticipo_Users, `wkParticipo_user<=>userAttributes` WHERE wkParticipo_Users.id = `wkParticipo_user<=>userAttributes`.userId AND `wkParticipo_user<=>userAttributes`.attributeId = :attributeId;",
array(":attributeId"=>array('value'=>$userAttribute['id'], 'data_type'=>PDO::PARAM_INT))
);
echo( "<h2>".$userAttribute['name']."</h2>".array2htmlTableString($attributedUsers) );
// Add a withthraw link entry
foreach($attributedUsers as $index => $user){
$attributedUsers[$index] += ["withdrawLink" => "<a href=\"?action=withdrawUsersAttribute&userId=".$user["userId"]."&attributeId=".$userAttribute["id"]."\">withdraw ".$userAttribute["name"]."</a>"];
}
echo( "<h3>have it</h3>".arrayKeyed2htmlTableString($attributedUsers, ["userId", "name", "vorname", "withdrawLink"]) );
$attributedKeyList = [];
foreach($attributedUsers as $user){
$attributedKeyList[] = $user["userId"];
}
$unattributedUsers = array();
foreach($users as $user){
if(!in_array($user["id"], $attributedKeyList)){
$unattributedUsers[] = $user;
}
}
// Add a giveAttribute link entry to every user
foreach($unattributedUsers as $index => $user){
$unattributedUsers[$index] += ["giveAttributeLink" => "<a href=\"?action=giveUserAnUserAttribute&userId=".$user["id"]."&attributeId=".$userAttribute["id"]."\">give Attribute ".$userAttribute["name"]."</a>"];
}
echo( "<h3>give it</h3>".arrayKeyed2htmlTableString($unattributedUsers, ["id", "name", "vorname", "giveAttributeLink"]) );
}
?>

1
homepage/wkParticipo/login.php
View File

@@ -37,6 +37,7 @@ if (isset($_SESSION['login'])) {
),
);
$message['success'] = 'Anmeldung erfolgreich, <a href="index.php">weiter zum Inhalt.';
// PHPCount::AddHit("wkParticipo-Login ".$_POST['f']['username']);
header('Location: http://' . $_SERVER['HTTP_HOST'] . '/pages/desktop/wkParticipo/index.php?user=' . $_POST['f']['username']);
} else {
sleep(1);

165
wkOrg/src/wkScraper/jvsCal.py Normal file
View File

@@ -0,0 +1,165 @@
#! /usr/bin/env python3
# -*- coding: UTF-8 -*-
from bs4 import BeautifulSoup
import datetime
import json
import re
import requests
jvsCalUrl = "https://judoverbandsachsen.de/kalender/?show=all"
def parseJvsCal(url=jvsCalUrl, minYear = 0, minMonth = 0, onlyWithAks=False):
'''
Parse the calender page of the jvs
returns dictionary of dictionaries of list cal[year][month] = listOfUrls
'''
jvsCalPage = requests.get(url)
jvsCalSoup = BeautifulSoup(jvsCalPage.content, "html.parser")
jvsCalEventListItems = jvsCalSoup.find(id="eventListItems")
jvsCalEventMonts = jvsCalEventListItems.find_all("div", class_="month")
jvsWkList = {}
for m in jvsCalEventMonts:
if m.has_attr("data-month"):
yearMonth = m.get("data-month")
year = int(yearMonth[0:4])
if year < minYear:
continue
if not year in jvsWkList:
jvsWkList[year] = {}
month = int(yearMonth[4:6])
if year==minYear and month<minMonth:
continue
if month not in jvsWkList[year]:
jvsWkList[year][month] = []
events = m.find_all(class_="posts")
for event in events:
# url = event.find(class_="col-4").find("a")['href']
time, title, aks, place, url = parseJvsEvent(event, year)
if aks is None and onlyWithAks:
continue
jvsWkList[year][month].append({
"time": time,
"title": title,
"aks": aks,
"place": place,
"url": url
})
return jvsWkList
def parseJvsEvent(jvsEvent, year):
'''
Parse an event out of the jvsCalendar
return
'''
try:
aks = None
for e in jvsEvent.find_all(class_="col-2"):
if e.find("time"):
time = [ t.strip() for t in re.sub( "\s+", " ", e.find("time").text.strip() ).split("-")]
time = [ t.split(".") for t in time ]
time = [ "-".join( [str(year), t[1], t[0]] ) for t in time ]
if e.find("span"):
aks = [ ak.text.strip() for ak in e.find_all("span") ]
aks = [ ak for ak in aks if ak != "" ]
if len(aks) == 0:
aks=None
place = jvsEvent.find(class_="col-3").text.strip()
if place == "":
place = None
title = jvsEvent.find(class_="col-4").find("a").text.strip()
url = jvsEvent.find(class_="col-4").find("a")['href']
titleFull = jvsEvent.find(class_="col-4").text.strip()
assert(title==titleFull)
except Exception as e:
print(f"Error '{e}' parsing:")
print(jvsEvent.prettify())
return time, title, aks, place, url
def download_file(url):
local_filename = url.split('/')[-1]
# NOTE the stream=True parameter below
with requests.get(url, stream=True) as r:
r.raise_for_status()
with open(local_filename, 'wb') as f:
for chunk in r.iter_content(chunk_size=8192):
# If you have chunk encoded response uncomment if
# and set chunk_size parameter to None.
#if chunk:
f.write(chunk)
return local_filename
def getWk(urlList):
s=requests.Session()
return [ wettkampf.from_htmlString(s.get(url).content) for url in urlList]
class wettkampf:
def __init__(self, title, year, month, day, announcement, organizer, place, address, ageGroups):
self.title = str(title)
self.date = datetime.date(year, month, day)
self.announcement = str(announcement)
self.organizer = str(organizer)
self.place = str(place)
self.address = str(address)
self.ageGroups = ageGroups
return
def to_dict(self):
return {
'title': self.title,
'date': self.date.strftime("%Y-%m-%d"),
'announcement': self.announcement,
'organizer': self.organizer,
'place': self.place,
'address': self.address,
'ageGroups': self.ageGroups
}
def to_json(self):
return json.dumps(self.to_dict())
@staticmethod
def from_htmlString(wkString, year=None):
'''
Create a wettkampf from a html string of the event in the
calender of the JVS
the html string is only the wettkampf specific part in the page
of the wettkampf. Not the whole page and not the whole calender
'''
if year is None:
year = datetime.date.today().year
wkSoup = BeautifulSoup(wkString, "html.parser")
for e in wkSoup.find_all(class_="event-single"):
title = e.find("header").text.strip()
articleTag= e.find("article")
date = [ t.strip() for t in re.sub( "\s+", " ", articleTag.find("time").text.strip() ).split("-")]
date = [ t.split(".") for t in date ]
[announcementDiv, placeDiv, ageGroupsDiv] = articleTag.find_all("div")
announcement = None
for dt, dd in zip(articleTag.find_all("dt"), articleTag.find_all("dd")):
if dt.text.strip() == "Ausschreibung:":
announcement = dd.find("a")['href']
if dt.text.strip() == "Veranstalter:":
organizer = dd.text.strip()
if dt.text.strip() == "Veranstaltungsort:":
place = dd.text.strip()
if dt.text.strip() == "Veranstaltungsadresse:":
address = re.sub("\s+", " ", dd.text.strip())
if announcement is None:
print(f"no announcement in {e.prettify()}")
ageGroups = [ ak.text.strip() for ak in ageGroupsDiv.find_all("span") ]
return wettkampf(title, year, int(date[0][1]), int(date[0][0]), announcement, organizer, place, address, ageGroups)
@staticmethod
def from_url(url, year=None):
if year is None:
year = datetime.date.today().year
return wettkampf.from_htmlString( requests.get( url ).content, year )

197
wkOrg/src/wkScraper/wkScraper-JvsCal.py Executable file
View File

@@ -0,0 +1,197 @@
#! /usr/bin/env python3
# -*- coding: UTF-8 -*-
import re
import requests
from bs4 import BeautifulSoup
import datetime
import json
import jvsCal
class shiai:
def __init__(self, titel, date, ageGroups):
self.title = title
self.date = date
self.ageGroups = ageGroups
return
def toDict(self):
return {
'title': self.title,
'date': self.date,
'ageGroups': self.ageGroups,
}
def toJson(self):
return json.dumps(self.toDict())
class event:
'''
ein Event besteht aus:
- Zeitspanne
- Startdatum (+Endatum)
- Titel (Name)
- Ort
- Url
'''
def __init__(self, timespan, title, place=None, url=None):
self.date = datetime.date.fromisoformat( timespan[0] )
self.endDate = None
if len(timespan) >= 2:
self.endDate = datetime.date.fromisoformat( timespan[1] )
self.title = title
self.place = place
self.url = url
return
def toDict(self):
wkDict = {}
wkDict["date"] = str(self.date)
if self.endDate is not None:
wkDict["endDate"] = str(self.endDate)
wkDict["title"] = self.title
if self.place is not None:
wkDict["place"] = self.place
if self.url is not None:
wkDict["url"] = self.url
return wkDict
def toJson(self):
return json.dumps(self.toDict())
class wk(event):
def __init__(self, timespan, title, akList, place=None, url=None):
super().__init__(timespan, title, place, url)
self.akList = akList
def toDict(self):
wkDict = super().toDict()
wkDict["akList"] = self.akList
return wkDict
def parseJvsEvent(jvsEvent, onlyIfWithAk=False):
try:
aks = None
for e in jvsEvent.find_all(class_="col-2"):
if e.find("time"):
time = [ t.strip() for t in re.sub( "\s+", " ", e.find("time").text.strip() ).split("-")]
time = [ t.split(".") for t in time ]
time = [ "-".join( [year, t[1], t[0]] ) for t in time ]
if e.find("span"):
aks = [ ak.text.strip() for ak in e.find_all("span") ]
aks = [ ak for ak in aks if ak != "" ]
if len(aks) == 0:
aks=None
place = event.find(class_="col-3").text.strip()
if place == "":
place = None
title = event.find(class_="col-4").find("a").text.strip()
url = event.find(class_="col-4").find("a")['href']
titleFull = event.find(class_="col-4").text.strip()
assert(title==titleFull)
except:
print("Error parsing:")
print(event.prettify())
if aks is not None:
return wk(time, title, aks, place, url)
else:
if onlyIfWithAk:
return None
else:
return event(time, title, place, url)
events = jvsCal.parseJvsCal(minYear=datetime.date.today().year, minMonth=datetime.date.today().month, onlyWithAks=True)
#events = jvsCal.parseJvsCal()
#print( jvsCal.parseJvsCal(minYear=datetime.date.today().year, minMonth=datetime.date.today().month, onlyWithAks=True) )
print( [ e['url'] for y in events for m in events[y] for e in events[y][m]] )
print( jvsCal.getWk([ e['url'] for y in events for m in events[y] for e in events[y][m]]) )
exit()
jvsCalShiaiUrl = "https://judoverbandsachsen.de/events/23-raeucherkerzenpokal/"
testWk = jvsCal.wettkampf.from_url( jvsCalShiaiUrl )
print(testWk.to_json())
exit()
#with open("rkp.html", "w") as f:
# f.write(BeautifulSoup(requests.get("https://judoverbandsachsen.de/events/23-raeucherkerzenpokal/").content, "html.parser").prettify())
#exit()
url = "https://judoverbandsachsen.de/kalender/?show=all"
jvsCalShiaiUrl = "https://judoverbandsachsen.de/events/23-raeucherkerzenpokal/"
#jvsCalShiaiUrl = "file://rkp.html"
#jvsCalShiaiPage = requests.get(jvsCalShiaiUrl)
#jvsCalShiaiSoup = BeautifulSoup(jvsCalShiaiPage.content, "html.parser")
jvsCalShiaiSoup = BeautifulSoup(open("rkp.html"), "html.parser")
year = "2020"
for e in jvsCalShiaiSoup.find_all(class_="event-single"):
print(e.prettify())
title = e.find("header").text.strip()
articleTag= e.find("article")
date = [ t.strip() for t in re.sub( "\s+", " ", articleTag.find("time").text.strip() ).split("-")]
date = [ t.split(".") for t in date ]
date = [ "-".join( [year, t[1], t[0]] ) for t in date ]
[announcementDiv, placeDiv, ageGroupsDiv] = articleTag.find_all("div")
announcement = {}
place = {}
for dt, dd in zip(articleTag.find_all("dt"), articleTag.find_all("dd")):
if dt.text.strip() == "Ausschreibung:":
announcement['url'] = dd.find("a")['href']
if dt.text.strip() == "Veranstalter:":
announcement['organizer'] = dd.text.strip()
if dt.text.strip() == "Veranstaltungsort:":
place['name'] = dd.text.strip()
if dt.text.strip() == "Veranstaltungsadresse:":
place['address'] = re.sub("\s+", " ", dd.text.strip())
# print(dt.text, dd.text)
ageGroups = [ ak.text.strip() for ak in ageGroupsDiv.find_all("span") ]
print(f"title: {title})")
print(f"date: {date})")
print(f"announcement: {announcement}")
print(f"place: {place}")
print(f"ageGroups: {ageGroups}")
exit()
jvsCalPage = requests.get(url)
jvsCalSoup = BeautifulSoup(jvsCalPage.content, "html.parser")
#jvsCalEventList = jvsCalSoup.find(id="eventList")
#print(jvsCalEventList.prettify())
jvsCalEventListItems = jvsCalSoup.find(id="eventListItems")
#print(jvsCalEventListItems.prettify())
jvsCalEventMonts = jvsCalEventListItems.find_all("div", class_="month")
jvsWkList = []
for m in jvsCalEventMonts:
if m.has_attr("data-month"):
yearMonth = m.get("data-month")
year = (yearMonth[0:4])
month = yearMonth[4:6]
print(f"Jahr: {year}, Monat: {month}")
events = m.find_all(class_="posts")
for event in events:
parsedEvent = parseJvsEvent(event, onlyIfWithAk=True)
if parsedEvent is not None:
jvsWkList.append(parsedEvent)
else:
print("no data-month")
for w in jvsWkList:
print(w.toJson())