Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add scrum points #803

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/components/Item/ItemContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
constructMenuTimePickerOnChange,
constructTimePicker,
} from './helpers';
import { Icon } from '../Icon/Icon';

function useDatePickers(item: Item) {
const { stateManager, boardModifiers } = Preact.useContext(KanbanContext);
Expand Down Expand Up @@ -254,6 +255,22 @@ export const ItemContent = Preact.memo(function ItemContent({
onEditTime={onEditTime}
getDateColor={getDateColor}
/>

<div className={c('item-points-list')}>
{item.data.completedPoints != undefined && (
<div className={c('item-points-completed')}>
<Icon name="lightbulb" />
<span>{item.data.completedPoints}</span>
</div>
)}
{item.data.points != undefined && (
<div>
<Icon name="lightbulb" />
<span>{item.data.points}</span>
</div>
)}
</div>

{!hideTagsDisplay && !!item.data.metadata.tags?.length && (
<div className={c('item-tags')}>
{item.data.metadata.tags.map((tag, i) => {
Expand Down
13 changes: 12 additions & 1 deletion src/components/Lane/LaneHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ export const LaneHeader = Preact.memo(function LaneHeader({
}
}, [lane.data.forceEditMode]);

const [points, completedPoints] = lane.children.reduce(
([points, completedPoints], child) => {
return [
points + (child.data.points ?? 0),
completedPoints + (child.data.completedPoints ?? 0),
];
},
[0, 0]
);

return (
<>
<div
Expand All @@ -53,13 +63,14 @@ export const LaneHeader = Preact.memo(function LaneHeader({
<div className={c('lane-grip')} ref={dragHandleRef}>
<GripIcon />
</div>

<LaneTitle
isEditing={isEditing}
setIsEditing={setIsEditing}
itemCount={lane.children.length}
maxItems={lane.data.maxItems}
title={lane.data.title}
points={points}
completedPoints={completedPoints}
onChange={(e) => {
const { title, maxItems } = parseLaneTitle(
(e.target as HTMLTextAreaElement).value
Expand Down
13 changes: 12 additions & 1 deletion src/components/Lane/LaneTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export interface LaneTitleProps {
isEditing: boolean;
setIsEditing: Preact.StateUpdater<boolean>;
onChange: Preact.ChangeEventHandler<HTMLTextAreaElement>;
points: number;
completedPoints: number;
}

export function LaneTitle({
Expand All @@ -25,6 +27,8 @@ export function LaneTitle({
setIsEditing,
title,
onChange,
points,
completedPoints,
}: LaneTitleProps) {
const { stateManager } = Preact.useContext(KanbanContext);
const inputRef = Preact.useRef<HTMLTextAreaElement>();
Expand Down Expand Up @@ -84,7 +88,7 @@ export function LaneTitle({
const internalLinkPath =
e.target instanceof
(e.view as Window & typeof globalThis).HTMLAnchorElement &&
e.target.hasClass('internal-link')
e.target.hasClass('internal-link')
? e.target.dataset.href
: undefined;

Expand Down Expand Up @@ -113,6 +117,13 @@ export function LaneTitle({
)}
</div>
)}

{completedPoints != 0 && (
<div className={c('lane-title-points-completed')}>
{completedPoints}
</div>
)}
{points != 0 && <div className={c('lane-title-points')}>{points}</div>}
</>
);
}
2 changes: 2 additions & 0 deletions src/components/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ export interface ItemData {
metadata: ItemMetaData;
dom?: HTMLDivElement;
forceEditMode?: boolean;
points?: number;
completedPoints?: number;
}

export interface ErrorReport {
Expand Down
43 changes: 43 additions & 0 deletions src/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -1535,3 +1535,46 @@ body:not(.native-scrollbars)
left: 0;
transform: translate(0, -100%);
}

.kanban-plugin__item-points-list {
display: flex;
flex-wrap: wrap;
gap: 10px;
}

.kanban-plugin__item-points-list > .kanban-plugin__item-points-completed {
background-color: var(--color-accent);
}

.kanban-plugin__item-points-list .kanban-plugin__icon {
--icon-stroke: 3;
line-height: var(--line-height-tight);
}


.kanban-plugin__item-points-list > * {
background-color: var(--color-accent-2);
padding: 2px;
border-radius: 4px;
color: var(--text-on-accent);
}

.kanban-plugin__lane-title-points-completed {
color: var(--color-accent);
display: block;
padding: 4;
line-height: 1;
margin-left: 5px;
font-size: 13px;
font-weight: 600;
}

.kanban-plugin__lane-title-points {
color: var(--color-accent-2);
display: block;
padding: 4;
line-height: 1;
margin-left: 5px;
font-size: 13px;
font-weight: 600;
}
12 changes: 12 additions & 0 deletions src/parsers/formats/list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,18 @@ export function listItemToItemData(

itemData.title = replaceBrs(executeDeletion(title));

const extractPoints = (regex: RegExp) => {
const match = itemData.titleRaw.match(regex);
const result = parseFloat(match?.[1]);
if (!isNaN(result)) {
itemData.title = itemData.title.replace(match?.[0], '');
return result;
}
};

itemData.points = extractPoints(/\((\d+\.?\d*)\)/);
itemData.completedPoints = extractPoints(/(?<!\[)\[(\d+\.?\d*)\](?!\[)/);

return itemData;
}

Expand Down