X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Fprotocol%2FItem.js;h=9fcc7e5c6e09b539b837a2056513714dae8af359;hb=cd36cb0ba2718e6bfa08765e7702d57dfe7fd733;hp=f827f1ab0f9b8409dcbb5f15f5d7f735fefa0cfd;hpb=0f171dfffd9c0c2cc895c9f282c5f4550844cc5a;p=alttp.git

diff --git a/resources/js/components/protocol/Item.js b/resources/js/components/protocol/Item.js
index f827f1a..9fcc7e5 100644
--- a/resources/js/components/protocol/Item.js
+++ b/resources/js/components/protocol/Item.js
@@ -2,9 +2,12 @@ import moment from 'moment';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { ListGroup } from 'react-bootstrap';
-import { withTranslation } from 'react-i18next';
+import { Trans, withTranslation } from 'react-i18next';
 
 import Icon from '../common/Icon';
+import Spoiler from '../common/Spoiler';
+import { formatTime } from '../../helpers/Result';
+import { getUserName } from '../../helpers/User';
 import i18n from '../../i18n';
 
 const getEntryDate = entry => {
@@ -14,10 +17,51 @@ const getEntryDate = entry => {
 		: dateStr;
 };
 
+const getEntryDetailsUsername = entry => {
+	if (!entry || !entry.details || !entry.details.user) return 'Anonymous';
+	return getUserName(entry.details.user);
+};
+
+const getEntryRoundNumber = entry =>
+	(entry && entry.details && entry.details.round && entry.details.round.number) || '?';
+
+const getEntryResultTime = entry => {
+	if (!entry || !entry.details || !entry.details.result) return 'ERROR';
+	const result = entry.details.result;
+	if (result.forfeit) return 'DNF XX';
+	return formatTime(result);
+};
+
 const getEntryDescription = entry => {
 	switch (entry.type) {
-		case 'result.report':
+		case 'application.accepted':
+		case 'application.received':
+		case 'application.rejected':
+			return i18n.t(
+				`protocol.description.${entry.type}`,
+				{
+					...entry,
+					username: getEntryDetailsUsername(entry),
+				},
+			);
+		case 'result.report': {
+			const time = getEntryResultTime(entry);
+			return <Trans i18nKey={`protocol.description.${entry.type}`}>
+				<Spoiler>{{time}}</Spoiler>,
+			</Trans>;
+		}
 		case 'round.create':
+		case 'round.lock':
+		case 'round.unlock':
+			return i18n.t(
+				`protocol.description.${entry.type}`,
+				{
+					...entry,
+					number: getEntryRoundNumber(entry),
+				},
+			);
+		case 'result.comment':
+		case 'tournament.lock':
 			return i18n.t(
 				`protocol.description.${entry.type}`,
 				entry,
@@ -29,6 +73,15 @@ const getEntryDescription = entry => {
 
 const getEntryIcon = entry => {
 	switch (entry.type) {
+		case 'result.report':
+			return <Icon.RESULT />;
+		case 'round.create':
+			return <Icon.ADD />;
+		case 'round.lock':
+		case 'tournament.lock':
+			return <Icon.LOCKED />;
+		case 'round.unlock':
+			return <Icon.UNLOCKED />;
 		default:
 			return <Icon.PROTOCOL />;
 	}