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

some bugfixes machs

Browse Source
This commit is contained in:
marko
2021-12-20 19:10:55 +01:00
parent f7d2e699ff
commit 0c4334990e
9 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
homepage/machs/lib/achievementsLib.php
View File

@@ -141,7 +141,7 @@ return $html;
}
function htmlAchievementListForUser($db, $achievementGroups, $userId, $usersAchievmentIds, $noForm=false){
//var_dump($db, $achievementGroups, $userId, $usersAchievmentIds);
// var_dump($db, $achievementGroups, $userId, $usersAchievmentIds);
$ids=[];
foreach($usersAchievmentIds as $a){
$ids[]=$a['achievementId'];
@@ -154,12 +154,16 @@ $retHtml = "";
}
$retHtml .= "<div class=\"row\">";
foreach($achievementGroups as $g){
$records = record::getGroupsRecords($g->getId(), record::birthday2ageClass($userData[0]['gebDatum']));
$records = (
($userData[0]['gebDatum']!=null)?
(record::getGroupsRecords($g->getId(), record::birthday2ageClass($userData[0]['gebDatum']))):
[]
);
$retHtml .= "<div class=\"col s12 m6 l4 xl3\">";
$retHtml .= "<ul class=\"card\">";
// see, if there is a record for this group
$imgUrl = null;
foreach($g->achievements as $a){
foreach($g->getAchievements() as $a){
if($a['imgUrl'] != null){
$imgUrl = $a['imgUrl'];
}
@@ -256,6 +260,8 @@ $html = "";
$html .= "<input style=\"width:100%;display:block;\" name=\"level\" type=\"text\" value=\"".$level."\"/>";
$html .= "<label for=\"description\">description</label>";
$html .= "<input style=\"width:100%;display:block;\" name=\"description\" type=\"textarea\" value=\"".$description."\"/>";
$html .= "<label for=\"imgUrl\">imgUrl</label>";
$html .= "<input style=\"width:100%;display:block;\" name=\"imgUrl\" type=\"text\" value=\"".$imgUrl."\"/>";
$html .= "<input type=\"submit\"/>";
$html .= "</form>";
return $html;

1
homepage/machs/lib/db.php
View File

@@ -10,6 +10,7 @@ function getPdoDbConnection($hostname, $dbName, $user, $password){
}
catch(PDOException $dbError){
echo( "Error whilst getting a dbConnection!: " . $dbError->getMessage() );
var_dump($hostname, $dbName, $user, $password);
}
return $dbConnection;
}

9
homepage/machs/lib/record.php
View File

@@ -100,8 +100,9 @@ SQL;
$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.= "Um einen Rekord zu melden, schickt als Nachweis ein Video des Rekordes hoch an <a href=\"mailto:cwsvJudo@arcor.de\">cwsvJudo@arcor.de</a>.";
// $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'])){
@@ -121,12 +122,12 @@ SQL;
$retHtml.= "<input id=\"submit\" style=\"width:100%\" name=\"submit\" type=\"submit\" value=\"Rekord melden\">";
}
$retHtml.= "</form>";
$retHtml.= "<p>Sobald das Nachweisvideo gesichtet ist und es eine neue Bestleistung darstellt, wird der Rekord dann eingetragen und damit offiziell.</p>";
$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;
}
@@ -160,7 +161,7 @@ COLLAPSIBLE;
$group->loadAchievementGroupFromDb($gid);
$retHtml.= "";
var_dump($group->canHaveRecords());
// var_dump($group->canHaveRecords());
if($group->canHaveRecords()){
$retHtml = "<".$frameTag." class=\"card\">";
$retHtml.= "<div class=\"card-content\">";