diff --git a/homepage/machs/index.php b/homepage/machs/index.php index 2b946a9..44fffd8 100644 --- a/homepage/machs/index.php +++ b/homepage/machs/index.php @@ -34,6 +34,10 @@ processPostData($dbConnection, $_POST); + + + + @@ -72,34 +76,30 @@ processPostData($dbConnection, $_POST); } ?> - Eigene Achievements" ); - // echo( htmlUsersUploadBox($dbConnection, $_SESSION['user']['userId']) ); - echo(htmlAchievementListForUser( - $dbConnection, - $achievementGroups, - $_SESSION['user']['userId'], - getUsersAchievements($dbConnection, $_SESSION['user']['userId']) - )); + echo( "
"); + foreach($achievementGroups as $g){ + echo($g->asHtmlCard($_SESSION['user']['userId'])); + } + echo("
" ); } - ?> +?> - ".$k['vorname']." ".$k['name']."" ); - // echo( htmlUsersUploadBox($dbConnection, $k['kidId']) ); - echo(htmlAchievementListForUser( - $dbConnection, - $achievementGroups, - $k['id'], - getUsersAchievements($dbConnection, $k['id']) - )); +".$k['vorname']." ".$k['name']."" ); + echo( "
"); + foreach($achievementGroups as $g){ + echo($g->asHtmlCard($k['kidId'], ['noForm'=>false])); } } - ?> + echo("
" ); + } +?>
"; - $html .= "
Upload Link
".$userData['machsUploadUrl']."
"; - $html .= "
Upload Passwort
".$userData['machsUploadPw']."
"; - $html .= "
"; -return $html; + $html = ""; + $userData = getUserData($db, $userId); + $html .= "
"; + $html .= "
Upload Link
".$userData['machsUploadUrl']."
"; + $html .= "
Upload Passwort
".$userData['machsUploadPw']."
"; + $html .= "
"; + return $html; } function htmlAchievementListForUser($db, $achievementGroups, $userId, $usersAchievmentIds, $noForm=false){ diff --git a/homepage/machs/lib/machs/achievementGroup.php b/homepage/machs/lib/machs/achievementGroup.php index ee5af83..315ce84 100644 --- a/homepage/machs/lib/machs/achievementGroup.php +++ b/homepage/machs/lib/machs/achievementGroup.php @@ -197,7 +197,20 @@ SQL; // image + title if($this->imageUrl != null){ - $retHtml .= "
imageUrl."\">"; + $retHtml .= "
"; + $ext = pathinfo($this->imageUrl, PATHINFO_EXTENSION); + $ret."
".$this->imageUrl."
"; + $ret."
".$ext."
"; + switch($ext){ + case "webm": + $retHtml .= ""; + // $retHtml .= videoJsFrame(array('url'=>$this->imageUrl)); + // $retHtml .= "
Hier sollte ein Video sein!
"; + break; + default: + $retHtml .= "imageUrl."\">"; + break; + }; $retHtml .= "".$this->name.""; $retHtml .= "
"; } @@ -248,8 +261,12 @@ SQL; $retHtml .= ""; $retHtml .= ""; $retHtml .= ""; + //! warning for admins, that the user already had an achievement today + if( !canUserGetAchievementToday( $this->getDbConnection(), $uId) and isUserAdmin($this->getDbConnection(), $_SESSION['user']['userId']) ){ + $retHtml .= "
Heute wurde bereits eine Achievement erreicht!
"; + } + //! Only one achievements shall be given daily! Admins can overrule this! if( canUserGetAchievementToday( $this->getDbConnection(), $uId) or isUserAdmin($this->getDbConnection(), $_SESSION['user']['userId']) ){ -// $retHtml .= ""; $retHtml .= ""; } else{ @@ -419,4 +436,24 @@ function collectKeysValues($array, $key){ $values[]=$a[$key]; return $values; } + +//! create the