- Records page introduced
- rearangements in the include structure
This commit is contained in:
marko
@@ -5,18 +5,18 @@ require_once('./lib/db.php');
|
||||
class record{
|
||||
//< id of the record in the db
|
||||
private $id;
|
||||
//< id of current holder in the db
|
||||
private $userId;
|
||||
//< goup the record is for
|
||||
private $achievementGroupId;
|
||||
//< the age class the record is for
|
||||
private $ageClass;
|
||||
//< id of current holder in the db
|
||||
private $userId;
|
||||
//< when the record was established
|
||||
private $timestap;
|
||||
//< what the record is about
|
||||
private $description;
|
||||
//< the value to beat
|
||||
private $value;
|
||||
//< the achievement needed for the record
|
||||
private $unlockingAchievement;
|
||||
//< what the record is about
|
||||
private $description;
|
||||
|
||||
private static $db;
|
||||
/// Names of the columns in the db
|
||||
@@ -28,6 +28,10 @@ class record{
|
||||
self::$db = null;
|
||||
return;
|
||||
}
|
||||
public static function getDbConnection(){
|
||||
return self::$db;
|
||||
}
|
||||
|
||||
|
||||
public static function getAllRecords(){
|
||||
$query = <<<SQL
|
||||
@@ -42,6 +46,7 @@ SELECT * FROM `cwsvjudo`.`wkParticipo_Users`
|
||||
SQL;
|
||||
return dbQuery(self::$db, $query, ['userId'=>['value'=>$userId, 'data_type'=>PDO::PARAM_INT]]);
|
||||
}
|
||||
|
||||
// request the records of a group together with its holder
|
||||
// @param $groupId id of the group of achievements where the records are wanted
|
||||
// @param $ageClass the age class (as int only) for which the record is holding
|
||||
@@ -50,12 +55,10 @@ SQL;
|
||||
// - a value
|
||||
// - an age class
|
||||
public static function getGroupsRecords($groupId, $ageClass=null){
|
||||
// var_dump($groupId, $ageClass);
|
||||
//$ageClass = null; // DEBUG
|
||||
$query = "SELECT * FROM `cwsvjudo`.`machs_records` ";
|
||||
$query.= "JOIN `cwsvjudo`.`wkParticipo_Users` ";
|
||||
$query.= " ON `cwsvjudo`.`machs_records`.`userId` = `cwsvjudo`.`wkParticipo_Users`.`id` ";
|
||||
$query.= "WHERE `cwsvjudo`.`machs_records`.`achievementGroupId` = :groupId ";
|
||||
$query = "SELECT *, `cwsvjudo`.`machs_records`.`id` as `recordId` FROM `cwsvjudo`.`machs_records` ";
|
||||
$query.= " JOIN `cwsvjudo`.`wkParticipo_Users` ";
|
||||
$query.= " ON `cwsvjudo`.`machs_records`.`userId` = `cwsvjudo`.`wkParticipo_Users`.`id` ";
|
||||
$query.= " WHERE `cwsvjudo`.`machs_records`.`achievementGroupId` = :groupId ";
|
||||
$params =[
|
||||
'groupId'=>[ 'value'=>$groupId, 'data_type'=>PDO::PARAM_INT ]
|
||||
];
|
||||
@@ -63,10 +66,10 @@ SQL;
|
||||
$query.= " AND `cwsvjudo`.`machs_records`.`ageClass` <= :ageClass ";
|
||||
$params['ageClass'] = [ 'value'=>$ageClass, 'data_type'=>PDO::PARAM_INT ];
|
||||
}
|
||||
$query.= "ORDER BY `cwsvjudo`.`machs_records`.`value`;";
|
||||
//var_dump($query, $params);
|
||||
$query.= "ORDER BY `cwsvjudo`.`machs_records`.`value` DESC;";
|
||||
return dbQuery(self::$db, $query, $params);
|
||||
}
|
||||
|
||||
/// @param $r record as associative array
|
||||
public static function arrayRecord2htmlDl($r){
|
||||
$retHtml = "<dl>";
|
||||
@@ -75,6 +78,46 @@ SQL;
|
||||
$retHtml.= "</dl>";
|
||||
return $retHtml;
|
||||
}
|
||||
|
||||
public static function arrayRecord2htmlCardAction($r, $u, $gid){
|
||||
// $retHtml.= "<div class=\"card-action\">";
|
||||
$retHtml.= "<a class=\"waves-effect waves-light btn modal-trigger\" href=\"#reportRecord-user-".$u['id']."-group-".$gid."\">Rekord melden</a>";
|
||||
$retHtml.= "<div id=\"reportRecord-user-".$u['id']."-group-".$gid."\" class=\"modal\">";
|
||||
$retHtml.= "<div class=\"modal-content\">";
|
||||
$retHtml.= "Rekorde stellen in jeder Achievementgruppe und Altersklasse die Bestleistung unter allen Judoka dar. Rekorde können unabhänging vom eigenen, aktuellen Achievementstand aufgestellt werden.";
|
||||
$retHtml.= "Die Rekorde der jüngeren gelten auch für die älteren, aber nicht umgekehrt. ";
|
||||
$retHtml.= "Damit ein Rekord auch eingetragen wird, muss er mit einem Nachweis in Videoform gemeldet werden.";
|
||||
$retHtml.= "<h4>Rekord melden</h4>";
|
||||
$retHtml.= "Um einen Rekord zu melden, lade ein Video des Rekordes hoch:";
|
||||
$retHtml.= htmlUsersUploadBox(self::$db, $u['id']);
|
||||
$retHtml.= "<strong>Anschließend</strong> kannst Du den Rekord melden:";
|
||||
$retHtml.= "<form action=\".\" method=\"POST\">";
|
||||
if(isUserAdmin(record::$db, $_SESSION['user']['userId'])){
|
||||
$retHtml.= "<input name=\"action\" value=\"setRecord\" type=\"hidden\">";
|
||||
}
|
||||
else{
|
||||
$retHtml.= "<input name=\"action\" value=\"reportRecord\" type=\"hidden\">";
|
||||
}
|
||||
$retHtml.= "<input name=\"userId\" value=\"".$u['id']."\" type=\"hidden\">";
|
||||
$retHtml.= "<input name=\"achievementGroupId\" value=\"".$gid."\" type=\"hidden\">";
|
||||
$retHtml.= $u['vorname']." ".$u['name']." hat <input name=\"value\" placeholder=\"Zeit/Anzahl\"> geschafft.";
|
||||
|
||||
if(isUserAdmin(record::$db, $_SESSION['user']['userId'])){
|
||||
$retHtml.= "<input id=\"submit\" style=\"width:100%\" name=\"submit\" type=\"submit\" value=\"Rekord eintragen\">";
|
||||
}
|
||||
else{
|
||||
$retHtml.= "<input disabled=\"true\" id=\"submit\" style=\"width:100%\" name=\"submit\" type=\"submit\" value=\"Rekord melden\">";
|
||||
}
|
||||
$retHtml.= "</form>";
|
||||
$retHtml.= "</div>";
|
||||
$retHtml.= "<div class=\"modal-footer\">";
|
||||
$retHtml.= "<a href=\"#!\" class=\"modal-close waves-effect waves-green btn-flat\">Zurück</a>";
|
||||
$retHtml.= "</div>";
|
||||
$retHtml.= "</div>";
|
||||
// $retHtml.= "</div>";
|
||||
return $retHtml;
|
||||
}
|
||||
|
||||
/// @param $r record joined with it's holder as associative error
|
||||
/// @param $u user for whom the record is shown
|
||||
public static function arrayRecord2htmlCard($r, $u, $gid, $frameTag="div"){
|
||||
@@ -88,52 +131,80 @@ SQL;
|
||||
$retHtml.= $r['vorname']." ".$r['name']." mit ".$r['value']." in der U".$r['ageClass'];
|
||||
}
|
||||
$retHtml.= "</div>";
|
||||
$retHtml.= "<div class=\"card-action\">";
|
||||
$retHtml.= "<a class=\"waves-effect waves-light btn modal-trigger\" href=\"#reportRecord-user-".$u['id']."-group-".$gid."\">Rekord melden</a>";
|
||||
$retHtml.= "<div id=\"reportRecord-user-".$u['id']."-group-".$gid."\" class=\"modal\">";
|
||||
$retHtml.= "<div class=\"modal-content\">";
|
||||
$retHtml.= "Rekorde stellen in jeder Achievementgruppe und Altersklasse die Bestleistung unter allen Judoka dar. Rekorde können unabhänging vom eigenen, aktuellen Achievementstand aufgestellt werden.";
|
||||
$retHtml.= "Die Rekorde der jüngeren gelten auch für die älteren, aber nicht umgekehrt. ";
|
||||
$retHtml.= "Damit ein Rekord auch eingetragen wird, muss er mit einem Nachweis in Videoform gemeldet werden.";
|
||||
$retHtml.= "<h4>Rekord melden</h4>";
|
||||
$retHtml.= "Um einen Rekord zu melden, lade ein Video des Rekordes hoch:";
|
||||
$retHtml.= htmlUsersUploadBox(self::$db, $u['id']);
|
||||
$retHtml.= "Anschließend kannst Du den Rekord melden:";
|
||||
$retHtml.= "<form action=\".\" method=\"POST\">";
|
||||
if(isUserAdmin(record::$db, $_SESSION['user']['userId'])){
|
||||
$retHtml.= "<input name=\"action\" value=\"setRecord\" type=\"hidden\">";
|
||||
}
|
||||
else{
|
||||
$retHtml.= "<input name=\"action\" value=\"reportRecord\" type=\"hidden\">";
|
||||
}
|
||||
$retHtml.= "<input name=\"userId\" value=\"".$u['id']."\" type=\"hidden\">";
|
||||
$retHtml.= "<input name=\"achievementGroupId\" value=\"".$gid."\" type=\"hidden\">";
|
||||
$retHtml.= $u['vorname']." ".$u['name']." hat <input name=\"value\" placeholder=\"Zeit/Anzahl\"> geschafft.";
|
||||
if(isUserAdmin(record::$db, $_SESSION['user']['userId'])){
|
||||
$retHtml.= "<input style=\"width:100%\" name=\"submit\" type=\"submit\" value=\"Rekord eintragen\">";
|
||||
}
|
||||
else{
|
||||
$retHtml.= "<input style=\"width:100%\" name=\"submit\" type=\"submit\" value=\"Rekord melden\">";
|
||||
}
|
||||
$retHtml.= "</form>";
|
||||
$retHtml.= "</div>";
|
||||
$retHtml.= "<div class=\"modal-footer\">";
|
||||
$retHtml.= "<a href=\"#!\" class=\"modal-close waves-effect waves-green btn-flat\">Zurück</a>";
|
||||
$retHtml.= "</div>";
|
||||
$retHtml.= "</div>";
|
||||
$retHtml.= "</div>";
|
||||
|
||||
$retHtml.= "</".$frameTag.">";
|
||||
return $retHtml;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
public static function birthday2ageClass($birthdateString){
|
||||
$birthDate = DateTime::createFromFormat("Y-m-d", $birthdateString);
|
||||
$birthYear= (int)$birthDate->format("Y");
|
||||
$thisYear = (int)date('Y');
|
||||
return $thisYear - $birthYear + 1;
|
||||
}
|
||||
|
||||
// get an ageClasses records including its holders
|
||||
public static function getRecordsOfAgeClass($ageClass, $achievementGroup, $options=[]){
|
||||
$query = <<<SQL
|
||||
SELECT * FROM `cwsvjudo`.`machs_records`
|
||||
JOIN `cwsvjudo`.`wkParticipo_Users`
|
||||
ON `cwsvjudo`.`machs_records`.`userId` = cwsvjudo`.`wkParticipo_Users`.`id`
|
||||
WHERE `cwsvjudo`.`machs_records`.`ageClass` = :ageClass ";
|
||||
AND `cwsvjudo`.`machs_records`.`achievementGroupId` = :achievementGroupId;
|
||||
SQL;
|
||||
$params = [
|
||||
':ageClass'=>['value'=>$ageClass, 'data_type'=>PDO::PARAM_INT],
|
||||
':achievementGroupId'=>['value'=>$achievementGroupId, 'data_type'=>PDO::PARAM_INT],
|
||||
];
|
||||
$returns = query($this->getDbConnection(), $query, $params);
|
||||
return $records;
|
||||
}
|
||||
|
||||
// returns all age classes with records
|
||||
public static function getAgeClassesWithRecord($achievementGroupId=null){
|
||||
$params = null;
|
||||
$query="SELECT DISTINCT `ageClass` FROM `cwsvjudo`.`machs_records` ";
|
||||
if($achievementGroupId != null){
|
||||
$query.="WHERE `achievementGroupId` = :achievementGroupId ";
|
||||
$params=[];
|
||||
$params[':achievementGroupId'] = ['value'=>$achievementGroupId, 'data_type'=>PDO::PARAM_INT];
|
||||
}
|
||||
$query.="ORDER BY `ageClass`";
|
||||
$ageClasses = dbQuery(self::$db, $query, $params);
|
||||
return $ageClasses;
|
||||
}
|
||||
|
||||
// load the achievement from the DB
|
||||
public function loadFromDb($id){
|
||||
$query = "SELECT * from `cwsvjudo`.`machs_records` WHERE `id`=:id;";
|
||||
$params = [':id'=>['value'=>$id, 'data_type'=>PDO::PARAM_INT]];
|
||||
$achievements = query($this->getDbConnection(), $query, $params);
|
||||
$this->setFromAssocArray($achievements[0]);
|
||||
}
|
||||
// set the members of the record via an associative array (like the ones, that are returned by dbquery)
|
||||
public function setFromAssocArray($assocArray){
|
||||
$this->id = (int)$assocArray['id'];
|
||||
$this->achievementGroupId = (int)$assocArray['achievementGroupId'];
|
||||
$this->ageClass = (int)$assocArray['ageClass'];
|
||||
$this->userId = (int)$assocArray['userId'];
|
||||
$this->timestap = $assocArray['userId'];
|
||||
$this->value = $assocArray['value'];
|
||||
}
|
||||
|
||||
static public function htmlRanking($recordList){
|
||||
if(empty($recordList))
|
||||
return "";
|
||||
$html = "<table>";
|
||||
$html.= "<tr><th>Judoka</th><th>Rekord</th><th>Video</th></tr>";
|
||||
foreach($recordList as $record){
|
||||
$html.="<tr><td>".$record['vorname']." ".$record['name']."</td><td>".$record['value']."</td><td><a href=\"videos.d/records/".$record['recordId'].".webm\" >Video</a></td></tr>";
|
||||
}
|
||||
$html.= "</table>";
|
||||
return $html;
|
||||
}
|
||||
}
|
||||
|
||||
/// Als String gegebene Altersklassen als Jahrgangsintervalle
|
||||
|
||||
Reference in New Issue
Block a user