aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/client/views/presentationview/PresentationElement.tsx88
-rw-r--r--src/client/views/presentationview/PresentationView.tsx17
2 files changed, 2 insertions, 103 deletions
diff --git a/src/client/views/presentationview/PresentationElement.tsx b/src/client/views/presentationview/PresentationElement.tsx
index eb7002731..f5220c564 100644
--- a/src/client/views/presentationview/PresentationElement.tsx
+++ b/src/client/views/presentationview/PresentationElement.tsx
@@ -15,7 +15,6 @@ interface PresentationElementProps {
index: number;
deleteDocument(index: number): void;
gotoDocument(index: number): void;
- groupedMembers: Doc[][];
allListElements: Doc[];
groupMappings: Map<String, Doc[]>;
@@ -45,12 +44,9 @@ export default class PresentationElement extends React.Component<PresentationEle
let newGuid = Utils.GenerateGuid();
let aboveGuid = StrCast(p.allListElements[index - 1].presentId, null);
let docGuid = StrCast(document.presentId, null);
- // if (aboveGuid !== undefined) {
if (p.groupMappings.has(aboveGuid)) {
let aboveArray = p.groupMappings.get(aboveGuid)!;
if (p.groupMappings.has(docGuid)) {
- console.log("Doc Guid: ", docGuid);
- console.log("Above Guid: ", aboveGuid);
let docsArray = p.groupMappings.get(docGuid)!;
docsArray.forEach((doc: Doc) => {
if (!aboveArray.includes(doc)) {
@@ -91,27 +87,6 @@ export default class PresentationElement extends React.Component<PresentationEle
}
document.presentId = aboveGuid;
- // } else {
- // p.allListElements[index - 1].presentId = newGuid;
- // let newAboveArray: Doc[] = [];
- // newAboveArray.push(p.allListElements[index - 1]);
- // if (p.groupMappings.has(docGuid)) {
- // let docsArray = p.groupMappings.get(docGuid)!;
- // docsArray.forEach((doc: Doc) => {
- // doc.presentId = newGuid;
- // newAboveArray.push(doc);
- // });
- // p.groupMappings.delete(docGuid);
- // } else {
- // newAboveArray.push(document);
- // }
- // document.presentId = newGuid;
- // p.groupMappings.set(newGuid, newAboveArray);
- // console.log("New Array created");
-
-
- // }
-
} else {
let curArray = p.groupMappings.get(StrCast(document.presentId, Utils.GenerateGuid()))!;
let targetIndex = curArray.indexOf(document);
@@ -130,64 +105,6 @@ export default class PresentationElement extends React.Component<PresentationEle
}
@action
- onGroupClickRec = (document: Doc, index: number, buttonStatus: boolean) => {
- let p = this.props;
- if (buttonStatus) {
- if (index >= 1) {
- if (p.groupedMembers[index].length >= 0) {
- p.groupedMembers[index].forEach((doc: Doc) => {
- if (!p.groupedMembers[index - 1].includes(doc)) {
- p.groupedMembers[index - 1].push(doc);
- }
- });
- }
-
- if (index >= 2) {
- let nextBool = p.groupedMembers[index - 2].length !== 1;
- if (nextBool === buttonStatus) {
- this.onGroupClickRec(document, index - 1, p.groupedMembers[index - 2].length !== 1);
- }
- }
-
- }
- }
- else {
-
- if (index >= 1) {
- let removeSize = p.groupedMembers[index].length;
- if (p.groupedMembers[index].length >= 0) {
- p.groupedMembers[index].forEach((doc: Doc) => {
- p.groupedMembers[index - 1].pop(); console.log("Reached!!");
- });
- }
-
- if (index >= 2) {
- let nextBool = p.groupedMembers[index - 2].length !== 1;
- if (nextBool !== buttonStatus) {
- this.recursiveDeleteGroups(index - 1, removeSize);
- }
- }
- }
- }
-
- }
-
- @action
- recursiveDeleteGroups = (index: number, removeSize: number) => {
- let p = this.props;
- for (let i = 0; i < removeSize; i++) {
- p.groupedMembers[index - 1].pop();
- }
- if (index >= 2) {
-
- let nextBool = p.groupedMembers[index - 2].length !== 1;
- if (nextBool === true) {
- this.recursiveDeleteGroups(index - 1, removeSize);
- }
- }
- }
-
- @action
changeGroupStatus = () => {
if (this.selectedButtons[buttonIndex.Group]) {
this.selectedButtons[buttonIndex.Group] = false;
@@ -196,10 +113,6 @@ export default class PresentationElement extends React.Component<PresentationEle
}
}
- printGroupSizes = () => {
- this.props.groupedMembers.forEach((doc: Doc[], index: number) => console.log("Index: ", index, " size: ", doc.length));
- }
-
@action
onHideDocumentUntilPressClick = (e: React.MouseEvent) => {
e.stopPropagation();
@@ -254,7 +167,6 @@ export default class PresentationElement extends React.Component<PresentationEle
e.stopPropagation();
this.changeGroupStatus();
this.onGroupClick(p.document, p.index, this.selectedButtons[buttonIndex.Group]);
- //this.printGroupSizes();
}}>F</button>
</div>
diff --git a/src/client/views/presentationview/PresentationView.tsx b/src/client/views/presentationview/PresentationView.tsx
index 79b7c1f15..3263ea62e 100644
--- a/src/client/views/presentationview/PresentationView.tsx
+++ b/src/client/views/presentationview/PresentationView.tsx
@@ -19,7 +19,6 @@ export interface PresViewProps {
interface PresListProps extends PresViewProps {
deleteDocument(index: number): void;
gotoDocument(index: number): void;
- groupedMembers: Doc[][];
groupMappings: Map<String, Doc[]>;
}
@@ -50,17 +49,6 @@ class PresentationViewList extends React.Component<PresListProps> {
// }
// }
// }
- @action
- initializeGroupArrays = (docList: Doc[]) => {
- console.log("Starting len: ", this.props.groupedMembers.length);
- docList.forEach((doc: Doc, index: number) => {
- if (this.props.groupedMembers.length < index + 2) {
- this.props.groupedMembers[index] = [];
- this.props.groupedMembers[index].push(docList[index]);
-
- }
- });
- }
@action
initializeGroupIds = (docList: Doc[]) => {
@@ -118,12 +106,11 @@ class PresentationViewList extends React.Component<PresListProps> {
render() {
const children = DocListCast(this.props.Document.data);
- this.initializeGroupArrays(children);
this.initializeGroupIds(children);
return (
<div className="presentationView-listCont">
- {children.map((doc: Doc, index: number) => <PresentationElement key={index} mainDocument={this.props.Document} document={doc} index={index} deleteDocument={this.props.deleteDocument} gotoDocument={this.props.gotoDocument} groupedMembers={this.props.groupedMembers} groupMappings={this.props.groupMappings} allListElements={children} />)}
+ {children.map((doc: Doc, index: number) => <PresentationElement key={index} mainDocument={this.props.Document} document={doc} index={index} deleteDocument={this.props.deleteDocument} gotoDocument={this.props.gotoDocument} groupMappings={this.props.groupMappings} allListElements={children} />)}
</div>
);
}
@@ -210,7 +197,7 @@ export class PresentationView extends React.Component<PresViewProps> {
<button className="presentation-button" onClick={this.back}>back</button>
<button className="presentation-button" onClick={this.next}>next</button>
</div>
- <PresentationViewList Document={this.props.Document} deleteDocument={this.RemoveDoc} gotoDocument={this.gotoDocument} groupedMembers={this.groupedMembers} groupMappings={this.groupMappings} />
+ <PresentationViewList Document={this.props.Document} deleteDocument={this.RemoveDoc} gotoDocument={this.gotoDocument} groupMappings={this.groupMappings} />
</div>
);
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-12 22:50:59 +0000