From a3d8b212bbf3291f65b6d9a3f959921bedc10143 Mon Sep 17 00:00:00 2001
From: marko <marko@cana>
Date: Sat, 25 Dec 2021 17:25:55 +0100
Subject: [PATCH] bring back modern look for achievement cards

---
 homepage/machs/index.php                      | 40 +++++++++----------
 homepage/machs/lib/achievementsLib.php        | 14 +++----
 homepage/machs/lib/machs/achievementGroup.php | 13 +++++-
 homepage/machs/lib/record.php                 |  4 +-
 homepage/participo/css/parsedownCard.css      |  1 -
 5 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/homepage/machs/index.php b/homepage/machs/index.php
index 2b946a9..cb8dd44 100644
--- a/homepage/machs/index.php
+++ b/homepage/machs/index.php
@@ -72,34 +72,30 @@ processPostData($dbConnection, $_POST);
 	}
 ?>
 		
-		<?php
+<?php
 		if( hasUserAttribute($dbConnection, $_SESSION['user']['userId'], "inTraining" ) ){
 			echo( "<h2>Eigene Achievements</h2>" );
-			// echo( htmlUsersUploadBox($dbConnection, $_SESSION['user']['userId']) );
-			echo(htmlAchievementListForUser(
-				$dbConnection, 
-				$achievementGroups, 
-				$_SESSION['user']['userId'], 
-				getUsersAchievements($dbConnection, $_SESSION['user']['userId'])
-			));
+			echo( "<div style=\"display:flex; flex-wrap:wrap; align-items:stretch;\" class=\"row\">");
+			foreach($achievementGroups as $g){
+				echo($g->asHtmlCard($_SESSION['user']['userId']));
+				}
+			echo("</div>" );		
 		}
-		?>
+?>
 		
-		<?php
-			$usersKids = getUsersKids($dbConnection, $_SESSION['user']['userId']);
-			foreach($usersKids as $k){
-				if( hasUserAttribute($dbConnection, $k['kidId'], "inTraining" ) and ($k['kidId']!=$_SESSION['user']['userId']) ){
-					echo( "<h2>".$k['vorname']." ".$k['name']."</h2>" );
-					// echo( htmlUsersUploadBox($dbConnection, $k['kidId']) );
-					echo(htmlAchievementListForUser(
-						$dbConnection, 
-						$achievementGroups, 
-						$k['id'], 
-						getUsersAchievements($dbConnection, $k['id'])
-					));
+<?php // show the achievements of each kid
+		$usersKids = getUsersKids($dbConnection, $_SESSION['user']['userId']);
+		foreach($usersKids as $k){
+			if( hasUserAttribute($dbConnection, $k['kidId'], "inTraining" ) ){
+				echo( "<h2>".$k['vorname']." ".$k['name']."</h2>" );
+				echo( "<div style=\"display:flex; flex-wrap:wrap; align-items:stretch;\" class=\"row\">");
+				foreach($achievementGroups as $g){
+					echo($g->asHtmlCard($k['kidId'], ['noForm'=>false]));
 				}
 			}
-		?>
+			echo("</div>" );
+		}
+?>
 		
 <?php
 	if(isUserAdmin($dbConnection, $_SESSION['user']['userId'])){
diff --git a/homepage/machs/lib/achievementsLib.php b/homepage/machs/lib/achievementsLib.php
index 3e2a86c..e8eb8b7 100644
--- a/homepage/machs/lib/achievementsLib.php
+++ b/homepage/machs/lib/achievementsLib.php
@@ -131,13 +131,13 @@ return $groups;
 }
 
 function htmlUsersUploadBox($db, $userId){
-$html = "";
-	$userData = getUserData($db, $userId);
-	$html .= "<div><dl>";
-	$html .= "<dt>Upload Link</dt><dd><a href=\"".$userData['machsUploadUrl']."\">".$userData['machsUploadUrl']."</a></dd>";
-	$html .= "<dt>Upload Passwort</dt><dd>".$userData['machsUploadPw']."</dd>";
-	$html .= "</dl></div>";
-return $html;
+	$html = "";
+		$userData = getUserData($db, $userId);
+		$html .= "<div><dl>";
+		$html .= "<dt>Upload Link</dt><dd><a href=\"".$userData['machsUploadUrl']."\">".$userData['machsUploadUrl']."</a></dd>";
+		$html .= "<dt>Upload Passwort</dt><dd>".$userData['machsUploadPw']."</dd>";
+		$html .= "</dl></div>";
+	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..942e558 100644
--- a/homepage/machs/lib/machs/achievementGroup.php
+++ b/homepage/machs/lib/machs/achievementGroup.php
@@ -197,7 +197,18 @@ SQL;
 
 		// image + title
 		if($this->imageUrl != null){
-			$retHtml .= "<div class=\"card-image\"><img src=\"".$this->imageUrl."\">";
+			$retHtml .= "<div class=\"card-image\">";
+			$ext = pathinfo($this->imageUrl, PATHINFO_EXTENSION);
+			$ret."<div>".$this->imageUrl."</div>";
+			$ret."<div>".$ext."</div>";
+			switch($ext){
+				case "webm":
+					$retHtml .= "<video controls><source src=\"".$this->imageUrl."\" type=\"video/webm\">Video tag is not supported in this browser.</video>";
+					break;
+				default:
+					$retHtml .= "<img src=\"".$this->imageUrl."\">";
+					break;
+				};
 			$retHtml .= "<span class=\"card-title\">".$this->name."</span>";
 			$retHtml .= "</div>";
 		}
diff --git a/homepage/machs/lib/record.php b/homepage/machs/lib/record.php
index 01f5f13..3d8e852 100644
--- a/homepage/machs/lib/record.php
+++ b/homepage/machs/lib/record.php
@@ -41,12 +41,12 @@ class record{
 			"ON `wkParticipo_Users`.`id` = `achievements<=>user`.`userId` ".
 			(
 				($from!=null&&$to!=null)?
-				("BETWEEN CONVERT(\"".$from."\", datetime) AND CONVERT(\"".$to."\", datetime) "):
+				(" WHERE `achievements<=>user`.`timestamp` BETWEEN CONVERT(\"".$from."\", datetime) AND CONVERT(\"".$to."\", datetime) "):
 				("")
 			).
 			"GROUP BY `wkParticipo_Users`.`id` ".
 			"ORDER BY `COUNT(*)` DESC;";
-	return dbQuery(self::$db, $query);
+		return dbQuery(self::$db, $query);
 	}
 	
 	public static function getAllRecords(){
diff --git a/homepage/participo/css/parsedownCard.css b/homepage/participo/css/parsedownCard.css
index 22fe9f9..1576171 100644
--- a/homepage/participo/css/parsedownCard.css
+++ b/homepage/participo/css/parsedownCard.css
@@ -13,4 +13,3 @@
 .parsedownCard img{
     max-width: 100%;
 }
-