Grouping done

2 files changed, 62 insertions, 44 deletions

diff --git a/src/client/views/presentationview/PresentationElement.tsx b/src/client/views/presentationview/PresentationElement.tsx
index 2d14476d2..eb7002731 100644
--- a/src/client/views/presentationview/PresentationElement.tsx
+++ b/src/client/views/presentationview/PresentationElement.tsx
@@ -45,72 +45,79 @@ 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)) {
-                                    aboveArray.push(doc);
-
-                                }
-                            });
-                            console.log("CAlled first one");
-
-                        } else {
-                            if (!aboveArray.includes(document)) {
-                                aboveArray.push(document);
-                                console.log("CAlled this one");
-                                console.log("Doc: ", document);
-
+                // 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)) {
+                                aboveArray.push(doc);
                             }
-
-                        }
-                        console.log("AboveArray Size: ", aboveArray.length);
+                            doc.presentId = aboveGuid;
+                        });
+                        console.log("CAlled first one");
+                        p.groupMappings.delete(docGuid);
                     } else {
-                        let newAboveArray: Doc[] = [];
-                        newAboveArray.push(p.allListElements[index - 1]);
-                        if (p.groupMappings.has(docGuid)) {
-                            let docsArray = p.groupMappings.get(docGuid)!;
-                            docsArray.forEach((doc: Doc) => {
-                                newAboveArray.push(doc);
-
-                            });
-                        } else {
-                            newAboveArray.push(document);
+                        if (!aboveArray.includes(document)) {
+                            aboveArray.push(document);
+                            console.log("CAlled this one");
+                            console.log("Doc: ", document);
 
                         }
-                        p.groupMappings.set(aboveGuid, newAboveArray);
-                        console.log("NewABove array size: ", newAboveArray.length);
-
-
 
                     }
-                    document.presentId = aboveGuid;
+                    console.log("AboveArray Size: ", aboveArray.length);
                 } 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) => newAboveArray.push(doc));
+                        docsArray.forEach((doc: Doc) => {
+                            newAboveArray.push(doc);
+                            doc.presentId = aboveGuid;
+                        });
+                        p.groupMappings.delete(docGuid);
                     } else {
                         newAboveArray.push(document);
+
                     }
-                    document.presentId = newGuid;
-                    p.groupMappings.set(newGuid, newAboveArray);
-                    console.log("New Array created");
+                    p.groupMappings.set(aboveGuid, newAboveArray);
+                    console.log("NewABove array size: ", newAboveArray.length);
+
 
 
                 }
+                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);
                 let firstPart = curArray.slice(0, targetIndex);
+                let firstPartNewGuid = Utils.GenerateGuid();
+                firstPart.forEach((doc: Doc) => doc.presentId = firstPartNewGuid);
                 let secondPart = curArray.slice(targetIndex);
                 p.groupMappings.set(StrCast(p.allListElements[index - 1].presentId, Utils.GenerateGuid()), firstPart);
                 p.groupMappings.set(StrCast(document.presentId, Utils.GenerateGuid()), secondPart);
diff --git a/src/client/views/presentationview/PresentationView.tsx b/src/client/views/presentationview/PresentationView.tsx
index 6cf908d01..79b7c1f15 100644
--- a/src/client/views/presentationview/PresentationView.tsx
+++ b/src/client/views/presentationview/PresentationView.tsx
@@ -62,6 +62,16 @@ class PresentationViewList extends React.Component<PresListProps> {
         });
     }
 
+    @action
+    initializeGroupIds = (docList: Doc[]) => {
+        docList.forEach((doc: Doc, index: number) => {
+            let docGuid = StrCast(doc.presentId, null);
+            if (docGuid === undefined) {
+                doc.presentId = Utils.GenerateGuid();
+            }
+        });
+    }
+
     // /**
     //  * Renders a single child document. It will just append a list element.
     //  * @param document The document to render.
@@ -109,6 +119,7 @@ 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">