From 5fa4cc9a406ca4539d789465e1f8c2e4890534a0 Mon Sep 17 00:00:00 2001
From: Andre-Diamond <32074058+Andre-Diamond@users.noreply.github.com>
Date: Fri, 9 Feb 2024 06:14:40 +0200
Subject: [PATCH 1/3] Not all open Issues are showing up on Issue page - [Date:
 2024-02-09] Fixes #57

---
 components/nav.tsx            |   3 +
 pages/api/issues.js           |   6 +-
 pages/status-of-summaries.tsx | 101 ++++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 pages/status-of-summaries.tsx

diff --git a/components/nav.tsx b/components/nav.tsx
index 256784d..c103a75 100644
--- a/components/nav.tsx
+++ b/components/nav.tsx
@@ -129,6 +129,9 @@ const Nav = () => {
         <Link href='/issues' className="navitems">
           Issues
         </Link>
+        <Link href='/status-of-summaries' className="navitems">
+          Summaries
+        </Link>
       </div>
       <div>{latestTag}</div>
       <div>
diff --git a/pages/api/issues.js b/pages/api/issues.js
index 47a5e1e..02ab06e 100644
--- a/pages/api/issues.js
+++ b/pages/api/issues.js
@@ -6,14 +6,16 @@ export default async function handler(req, res) {
     const octokit = new Octokit({ auth: process.env.GITHUB_TOKEN });
 
     try {
-        const response = await octokit.rest.issues.listForRepo({
+        const issues = await octokit.paginate(octokit.rest.issues.listForRepo, {
             owner: 'SingularityNET-Archive',
             repo: 'archive-oracle',
             state: 'all',
+            per_page: 100, // Adjust per_page to your needs
         });
 
-        res.status(200).json(response.data);
+        res.status(200).json(issues);
     } catch (error) {
+        console.error("Failed to fetch issues:", error);
         res.status(500).json({ error: error.message });
     }
 }
diff --git a/pages/status-of-summaries.tsx b/pages/status-of-summaries.tsx
new file mode 100644
index 0000000..7f561f0
--- /dev/null
+++ b/pages/status-of-summaries.tsx
@@ -0,0 +1,101 @@
+import { useState, useEffect } from "react";
+import type { NextPage } from "next";
+import { fetchIssues } from '../utils/fetchIssues';
+import styles from '../styles/issues.module.css';
+
+interface Issue {
+  id: number;
+  title: string;
+  html_url: string;
+  state: string;
+}
+
+const StatusOfSummaries: NextPage = () => {
+  const [loading, setLoading] = useState<boolean>(false);
+  const [openIssues, setOpenIssues] = useState<Issue[]>([]);
+  const [closedIssues, setClosedIssues] = useState<Issue[]>([]);
+
+  const newIssueUrl = `https://github.com/SingularityNET-Archive/archive-oracle/issues/new?assignees=Andre-Diamond&labels=tool-issue&projects=SingularityNET-Archive%2F3&template=testing_issue.yml&title=%2AEnter+title+here%2A+-+%5BDate%3A+${getCurrentFormattedDate()}%5D`;
+
+  async function getIssues() {
+    setLoading(true);
+    const issues = await fetchIssues();
+    console.log(issues)
+    const open = issues.filter((issue: Issue) => issue.state === 'open');
+    const closed = issues.filter((issue: Issue) => issue.state === 'closed');
+    setOpenIssues(open);
+    setClosedIssues(closed);
+    setLoading(false);
+  }
+
+  useEffect(() => { 
+    getIssues()   
+  }, []); 
+
+  function getCurrentFormattedDate() {
+    const today = new Date();
+    const yyyy = today.getFullYear().toString();
+    let mm = (today.getMonth() + 1).toString(); // January is 0!
+    let dd = today.getDate().toString();
+  
+    if (dd.length < 2) dd = '0' + dd;
+    if (mm.length < 2) mm = '0' + mm;
+  
+    return yyyy + '-' + mm + '-' + dd;
+  }
+  
+  return (
+    <div className={styles.container}>
+      <h1>Issues</h1>
+      <a href={newIssueUrl} target="_blank" rel="noopener noreferrer">
+        <button className={styles.createIssueButton}>Create New Issue</button>
+      </a>
+      <div className={styles.issuesTableContainer}>
+  
+        {/* Open Issues Table */}
+        <table className={styles.issuesTable}>
+          <thead>
+            <tr>
+              <th colSpan={2}>Open Issues</th>
+            </tr>
+          </thead>
+          <tbody>
+            {openIssues.map(issue => (
+              <tr key={issue.id} className={styles.openIssue}>
+                <td>
+                  <a className={styles.openIssueLink} href={issue.html_url} target="_blank" rel="noopener noreferrer">
+                    {issue.title}
+                  </a>
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+  
+        {/* Closed Issues Table */}
+        <table className={styles.issuesTable}>
+          <thead>
+            <tr>
+                <th colSpan={2}>Closed Issues</th>
+            </tr>
+          </thead>
+          <tbody>
+            {closedIssues.map(issue => (
+              <tr key={issue.id}>
+                <td>
+                  <a className={styles.closedIssueLink} href={issue.html_url} target="_blank" rel="noopener noreferrer">
+                    {issue.title}
+                  </a>
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+  
+      </div>
+    </div>
+  );
+    
+};
+
+export default StatusOfSummaries;
\ No newline at end of file

From 06c8c9b33da10c21323e568411bda9276ee06e26 Mon Sep 17 00:00:00 2001
From: Andre-Diamond <32074058+Andre-Diamond@users.noreply.github.com>
Date: Fri, 9 Feb 2024 13:56:27 +0200
Subject: [PATCH 2/3] *Add No =Summary Given option* - [Date: 2024-02-06] Fixes
 #52

---
 components/SubmitMissingSummary.tsx    | 117 ++++++++++++++++++++++
 pages/api/fetchCsv.js                  |  40 ++++++++
 pages/api/updateCSV.js                 |  24 +++++
 pages/status-of-summaries.tsx          | 133 +++++++++++++------------
 styles/SubmitMissingSummary.module.css |  20 ++++
 styles/summariestable.module.css       |  65 ++++++++++++
 utils/getMissingSummaries.js           |  78 +++++++++++++++
 utils/saveMissingSummaries.js          |  23 +++++
 utils/updateCSVInGitHub.js             |  89 +++++++++++++++++
 9 files changed, 528 insertions(+), 61 deletions(-)
 create mode 100644 components/SubmitMissingSummary.tsx
 create mode 100644 pages/api/fetchCsv.js
 create mode 100644 pages/api/updateCSV.js
 create mode 100644 styles/SubmitMissingSummary.module.css
 create mode 100644 styles/summariestable.module.css
 create mode 100644 utils/getMissingSummaries.js
 create mode 100644 utils/saveMissingSummaries.js
 create mode 100644 utils/updateCSVInGitHub.js

diff --git a/components/SubmitMissingSummary.tsx b/components/SubmitMissingSummary.tsx
new file mode 100644
index 0000000..3434d4e
--- /dev/null
+++ b/components/SubmitMissingSummary.tsx
@@ -0,0 +1,117 @@
+import { useState } from 'react';
+import styles from '../styles/SubmitMissingSummary.module.css'; 
+import { saveMissingSummary } from '../utils/saveMissingSummaries'; 
+
+function formatDate(dateString: any) {
+    const options = { year: 'numeric', month: 'long', day: 'numeric' };
+    const date = new Date(dateString);
+    // Manually construct the date string to ensure it's in "DD MMMM YYYY" format
+    const formattedDate = `${date.getDate()} ${date.toLocaleString('en-US', { month: 'long' })} ${date.getFullYear()}`;
+    return formattedDate;
+  }
+
+const SubmitMissingSummary = ({ workgroups, allSummaries }: any) => {
+  const [selectedWorkgroup, setSelectedWorkgroup] = useState<{ workgroup: string; workgroup_id: string; } | null>(null);
+  const [meetingDate, setMeetingDate] = useState('');
+  
+  //console.log("allSummaries", allSummaries)
+  const handleSubmit = async (e: any) => {
+    e.preventDefault();
+    if (selectedWorkgroup && meetingDate) {
+      const missingSummaryData = {
+        workgroup: selectedWorkgroup.workgroup,
+        workgroupId: selectedWorkgroup.workgroup_id,
+        meetingDate: formatDate(meetingDate), // Assuming you want the formatted date here
+        status: "Missing",
+        type: "weekly"
+      };
+      const newRow = {
+        meetingDate: formatDate(meetingDate),
+        workgroup: selectedWorkgroup.workgroup,
+        status: "Missing"
+      };
+
+      const conflictSummary = allSummaries.find((summary: any) =>
+        summary.meetingDate === newRow.meetingDate && summary.workgroup === newRow.workgroup
+      );
+  
+      // If a "Done" summary exists for the same meetingDate and workgroup, alert the user
+      if (conflictSummary && conflictSummary.status === "Done") {
+        alert("This meeting is already marked as Done.");
+        return; // Prevent the submission
+      }
+      
+      const summariesToUpdate = newRow ? [...allSummaries, newRow] : allSummaries;
+  
+      try {
+        // First, save the missing summary through your existing utility function
+        const saveResponse = await saveMissingSummary(missingSummaryData);
+        console.log('Save missing summary response:', saveResponse);
+  
+        // If the save operation is successful, then update the CSV in GitHub
+        const response = await fetch('/api/updateCSV', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+              owner: "SingularityNET-Archive",
+              repo: "SingularityNET-Archive",
+              path: "Data/status-of-summaries.csv",
+              summariesToUpdate
+            }),
+          });
+      
+          if (!response.ok) {
+            throw new Error('Failed to update CSV');
+          }
+      
+          const responseData = await response.json();
+          console.log('CSV updated successfully:', responseData);
+      
+          // Reset form state here
+          setSelectedWorkgroup(null);
+          setMeetingDate('');
+      } catch (error) {
+        console.error('Error:', error);
+        // Handle error, e.g., showing an error message
+      }
+    }
+  };  
+
+  return (
+    <form className={styles.container} onSubmit={handleSubmit}>
+      <div className={styles.formGroup}>
+        <label htmlFor="workgroupSelect">Workgroup:</label>
+        <select
+          id="workgroupSelect"
+          value={selectedWorkgroup ? selectedWorkgroup.workgroup : ''}
+          onChange={(e) => {
+            const selectedValue = e.target.value;
+            const workgroupObject = workgroups.find((group: any) => group.workgroup === selectedValue);
+            setSelectedWorkgroup(workgroupObject || null);
+          }}
+          required
+        >
+          <option value="">Select a workgroup</option>
+          {workgroups.map((group: any) => (
+            <option key={group.workgroup_id} value={group.workgroup}>
+              {group.workgroup}
+            </option>
+          ))}
+        </select>
+      </div>
+      <div className={styles.formGroup}>
+        <label htmlFor="meetingDate">Meeting Date:</label>
+        <input
+          type="date"
+          id="meetingDate"
+          value={meetingDate}
+          onChange={(e) => setMeetingDate(e.target.value)}
+          required
+        />
+      </div>
+      <button type="submit" className={styles.submitButton}>Submit Missing Summary</button>
+    </form>
+  );
+};
+
+export default SubmitMissingSummary;
diff --git a/pages/api/fetchCsv.js b/pages/api/fetchCsv.js
new file mode 100644
index 0000000..d98e5d3
--- /dev/null
+++ b/pages/api/fetchCsv.js
@@ -0,0 +1,40 @@
+// pages/api/fetchCsv.js
+
+export default async function handler(req, res) {
+  const csvUrl = 'https://raw.githubusercontent.com/SingularityNET-Archive/SingularityNET-Archive/main/Data/status-of-summaries.csv';
+
+  try {
+    const csvResponse = await fetch(csvUrl);
+    const csvText = await csvResponse.text();
+
+    // Convert CSV text to JSON
+    const json = csvToJson(csvText); // Implement this function based on your CSV structure
+
+    res.status(200).json(json);
+  } catch (error) {
+    res.status(500).json({ error: "Failed to fetch CSV data" });
+  }
+}
+
+function csvToJson(csv) {
+  const lines = csv.split('\n');
+  const result = [];
+  const headers = lines[0].split(',');
+
+  for (let i = 1; i < lines.length; i++) {
+    const currentline = lines[i].split(',');
+    // Check if the line is empty or consists of only whitespace
+    if (currentline.length === 1 && currentline[0].trim() === '') {
+      continue; // Skip this iteration, effectively ignoring the empty row
+    }
+
+    let obj = {};
+    for (let j = 0; j < headers.length; j++) {
+      obj[headers[j]] = currentline[j];
+    }
+
+    result.push(obj);
+  }
+
+  return result;
+}
diff --git a/pages/api/updateCSV.js b/pages/api/updateCSV.js
new file mode 100644
index 0000000..ed18c8e
--- /dev/null
+++ b/pages/api/updateCSV.js
@@ -0,0 +1,24 @@
+// File: pages/api/updateCSV.js
+import { fetchAndUpdateCSV } from '../../utils/updateCSVInGitHub';
+
+export default async function handler(req, res) {
+  if (req.method !== 'POST') {
+    return res.status(405).send({ message: 'Only POST requests allowed' });
+  }
+
+  const { owner, repo, path, branch, summariesToUpdate } = req.body;
+
+  try {
+    const updateResponse = await fetchAndUpdateCSV({
+      owner,
+      repo,
+      path,
+      branch,
+      summariesToUpdate
+    });
+    res.status(200).json(updateResponse);
+  } catch (error) {
+    console.error('Error updating CSV in GitHub:', error);
+    res.status(500).json({ message: 'Failed to update CSV', error: error.message });
+  }
+}
diff --git a/pages/status-of-summaries.tsx b/pages/status-of-summaries.tsx
index 7f561f0..bc37b0b 100644
--- a/pages/status-of-summaries.tsx
+++ b/pages/status-of-summaries.tsx
@@ -1,101 +1,112 @@
 import { useState, useEffect } from "react";
 import type { NextPage } from "next";
-import { fetchIssues } from '../utils/fetchIssues';
-import styles from '../styles/issues.module.css';
+import styles from '../styles/summariestable.module.css';
+import SubmitMissingSummary from '../components/SubmitMissingSummary'; 
+import { getWorkgroups } from '../utils/getWorkgroups'; 
+import { getMissingSummaries } from '../utils/getMissingSummaries';
 
-interface Issue {
-  id: number;
-  title: string;
-  html_url: string;
-  state: string;
+interface SummaryData {
+  meetingDate: string;
+  status: string;
+  workgroup: string;
+  workgroupId: string;
 }
 
 const StatusOfSummaries: NextPage = () => {
   const [loading, setLoading] = useState<boolean>(false);
-  const [openIssues, setOpenIssues] = useState<Issue[]>([]);
-  const [closedIssues, setClosedIssues] = useState<Issue[]>([]);
+  const [data, setData] = useState<SummaryData[]>([]);
+  const [workgroups, setWorkgroups] = useState<any[]>([]); 
+  const [allSummaries, setAllSummaries] = useState<any[]>([]);
 
-  const newIssueUrl = `https://github.com/SingularityNET-Archive/archive-oracle/issues/new?assignees=Andre-Diamond&labels=tool-issue&projects=SingularityNET-Archive%2F3&template=testing_issue.yml&title=%2AEnter+title+here%2A+-+%5BDate%3A+${getCurrentFormattedDate()}%5D`;
-
-  async function getIssues() {
+  async function fetchCsvData() {
     setLoading(true);
-    const issues = await fetchIssues();
-    console.log(issues)
-    const open = issues.filter((issue: Issue) => issue.state === 'open');
-    const closed = issues.filter((issue: Issue) => issue.state === 'closed');
-    setOpenIssues(open);
-    setClosedIssues(closed);
+    try {
+      const response = await fetch('/api/fetchCsv');
+      const data = await response.json();
+      console.log('Fetched CSV data:', data);
+      setData(data); 
+    } catch (error) {
+      console.error("Failed to fetch CSV data:", error);
+    }
     setLoading(false);
   }
 
   useEffect(() => { 
-    getIssues()   
-  }, []); 
+    //fetchCsvData();
+    fetchWorkgroups(); // Add this line
+  }, []);
+
+  async function fetchWorkgroups() {
+    try {
+      const databaseWorkgroups = await getWorkgroups();
+      const allSummaries = await getMissingSummaries();
+      setAllSummaries(allSummaries)
+      
+      // Assuming databaseWorkgroups should be an array, check and handle accordingly
+      if (Array.isArray(databaseWorkgroups)) {
+        setWorkgroups(databaseWorkgroups);
+      } else {
+        console.error("Expected an array for workgroups, received:", databaseWorkgroups);
+        // Handle the unexpected format, e.g., set to an empty array or a default value
+        setWorkgroups([]);
+      }
+    } catch (error) {
+      console.error("Error fetching workgroups:", error);
+      setWorkgroups([]); // Handle error by setting workgroups to an empty array or another default state
+    }
+  }  
 
-  function getCurrentFormattedDate() {
-    const today = new Date();
-    const yyyy = today.getFullYear().toString();
-    let mm = (today.getMonth() + 1).toString(); // January is 0!
-    let dd = today.getDate().toString();
-  
-    if (dd.length < 2) dd = '0' + dd;
-    if (mm.length < 2) mm = '0' + mm;
-  
-    return yyyy + '-' + mm + '-' + dd;
-  }
-  
   return (
     <div className={styles.container}>
-      <h1>Issues</h1>
-      <a href={newIssueUrl} target="_blank" rel="noopener noreferrer">
-        <button className={styles.createIssueButton}>Create New Issue</button>
-      </a>
+      <SubmitMissingSummary workgroups={workgroups} allSummaries={allSummaries}/>
+      <h1>Status of Summaries</h1>
+      {loading && <p>Loading...</p>}
+
       <div className={styles.issuesTableContainer}>
-  
-        {/* Open Issues Table */}
+        {/* Missing Summaries Table */}
+        <h2 className={styles.missingHeading}>Missing Summaries</h2>
         <table className={styles.issuesTable}>
           <thead>
-            <tr>
-              <th colSpan={2}>Open Issues</th>
+            <tr className={styles.tableRow}>
+              <th className={styles.tableHeader}>Meeting Date</th>
+              <th className={styles.tableHeader}>Workgroup</th>
+              <th className={styles.tableHeader}>Status</th>
             </tr>
           </thead>
           <tbody>
-            {openIssues.map(issue => (
-              <tr key={issue.id} className={styles.openIssue}>
-                <td>
-                  <a className={styles.openIssueLink} href={issue.html_url} target="_blank" rel="noopener noreferrer">
-                    {issue.title}
-                  </a>
-                </td>
+            {allSummaries.filter(row => row.status === "Missing").map((row, index) => (
+              <tr key={index} className={styles.tableRow}>
+                <td className={styles.tableData}>{row.meetingDate}</td>
+                <td className={styles.tableData}>{row.workgroup}</td>
+                <td className={styles.tableData}>{row.status}</td>
               </tr>
             ))}
           </tbody>
         </table>
-  
-        {/* Closed Issues Table */}
+
+        {/* Done Summaries Table */}
+        <h2 className={styles.doneHeading}>Done Summaries</h2>
         <table className={styles.issuesTable}>
           <thead>
-            <tr>
-                <th colSpan={2}>Closed Issues</th>
+            <tr className={styles.tableRow}>
+              <th className={styles.tableHeader}>Meeting Date</th>
+              <th className={styles.tableHeader}>Workgroup</th>
+              <th className={styles.tableHeader}>Status</th>
             </tr>
           </thead>
           <tbody>
-            {closedIssues.map(issue => (
-              <tr key={issue.id}>
-                <td>
-                  <a className={styles.closedIssueLink} href={issue.html_url} target="_blank" rel="noopener noreferrer">
-                    {issue.title}
-                  </a>
-                </td>
+            {allSummaries.filter(row => row.status === "Done").map((row, index) => (
+              <tr key={index} className={styles.tableRow}>
+                <td className={styles.tableData}>{row.meetingDate}</td>
+                <td className={styles.tableData}>{row.workgroup}</td>
+                <td className={styles.tableData}>{row.status}</td>
               </tr>
             ))}
           </tbody>
         </table>
-  
       </div>
     </div>
   );
-    
 };
 
-export default StatusOfSummaries;
\ No newline at end of file
+export default StatusOfSummaries;
diff --git a/styles/SubmitMissingSummary.module.css b/styles/SubmitMissingSummary.module.css
new file mode 100644
index 0000000..e321e63
--- /dev/null
+++ b/styles/SubmitMissingSummary.module.css
@@ -0,0 +1,20 @@
+.container {
+  margin-top: 50px;
+  margin-bottom: 20px;
+}
+
+.formGroup {
+  margin-bottom: 10px;
+}
+
+.submitButton {
+  background-color: #4CAF50;
+  color: white;
+  padding: 10px 20px;
+  border: none;
+  cursor: pointer;
+}
+
+.submitButton:hover {
+  background-color: #45a049;
+}
diff --git a/styles/summariestable.module.css b/styles/summariestable.module.css
new file mode 100644
index 0000000..af397d5
--- /dev/null
+++ b/styles/summariestable.module.css
@@ -0,0 +1,65 @@
+.container {
+  color: #fff; /* White text color for better readability */
+  background-color: black; /* Assuming your background is black */
+  padding: 20px;
+}
+
+.issuesTable {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 20px;
+  table-layout: fixed; /* Add this line */
+}
+
+.tableHeader, .tableData {
+  text-align: left;
+  padding: 8px;
+  border-bottom: 1px solid #ddd; /* Light grey border for some contrast */
+}
+
+.tableHeader {
+  background-color: #333; /* Darker background for headers */
+  color: #fff;
+}
+
+/* Specify column widths */
+.tableHeader:nth-child(1) {
+  width: 30%; /* Adjust based on your preference */
+}
+
+.tableHeader:nth-child(2) {
+  width: 50%; /* Adjust based on your preference */
+}
+
+.tableHeader:nth-child(3) {
+  width: 20%; /* Adjust based on your preference */
+}
+
+.tableRow:hover {
+  background-color: #555; /* Slightly lighter row background on hover */
+}
+
+.missingHeading {
+  color: rgb(194, 129, 254); /* Golden color for headings */
+}
+
+.doneHeading {
+    color: rgb(0, 255, 221); /* Golden color for headings */
+}
+
+.createIssueButton {
+  background-color: #4CAF50; /* Green background */
+  color: white;
+  padding: 10px 20px;
+  margin: 10px 0;
+  border: none;
+  cursor: pointer;
+}
+
+.createIssueButton:hover {
+  background-color: #45a049;
+}
+
+.issuesTableContainer {
+  overflow-x: auto;
+}
diff --git a/utils/getMissingSummaries.js b/utils/getMissingSummaries.js
new file mode 100644
index 0000000..77497fc
--- /dev/null
+++ b/utils/getMissingSummaries.js
@@ -0,0 +1,78 @@
+import { supabase } from "../lib/supabaseClient";
+
+function formatDate(dateString) {
+    const options = { year: 'numeric', month: 'long', day: 'numeric' };
+    const date = new Date(dateString);
+    // Manually construct the date string to ensure it's in "DD MMMM YYYY" format
+    const formattedDate = `${date.getDate()} ${date.toLocaleString('en-US', { month: 'long' })} ${date.getFullYear()}`;
+    return formattedDate;
+}
+
+export async function getMissingSummaries() {
+    let missingSummaries = [];
+    let allDoneSummaries = [];
+  
+    async function getAllMissingSummaries() {
+      try {
+        const { data, error, status } = await supabase
+          .from('missingsummaries')
+          .select('workgroup, meeting_date, status');
+        
+        if (error && status !== 406) throw error;
+        if (data) {
+          missingSummaries = data.map(item => ({
+            ...item,
+            meetingDate: item.meeting_date,
+            status: item.status,
+            workgroup: item.workgroup
+          }));
+        }
+      } catch (error) {
+        console.log("error", error.message);
+      }
+    }
+  
+    async function getAllSummaries() {
+      try {
+        const { data, error, status } = await supabase
+          .from('meetingsummaries')
+          .select('date, summary')
+          .order('date', { ascending: false });
+  
+        if (error && status !== 406) throw error;
+        if (data) {
+          allDoneSummaries = data.map(item => ({
+            meetingDate: formatDate(item.date),
+            status: "Done", // Setting status to "Done" for all done summaries
+            workgroup: item.summary.workgroup
+          }));
+        }
+      } catch (error) {
+        console.log("error", error.message);
+      }
+    }
+  
+    await getAllMissingSummaries();
+    await getAllSummaries();
+
+    const combinedSummaries = [...missingSummaries, ...allDoneSummaries];
+    const uniqueSummariesMap = new Map();
+
+    combinedSummaries.forEach(summary => {
+        const key = `${summary.meetingDate}-${summary.workgroup}`;
+        // Check if the map already has an entry for this key
+        if (uniqueSummariesMap.has(key)) {
+          // Prioritize "Done" summaries over "Missing"
+          const existingSummary = uniqueSummariesMap.get(key);
+          if (existingSummary.status !== "Done" && summary.status === "Done") {
+            uniqueSummariesMap.set(key, summary);
+          }
+        } else {
+          uniqueSummariesMap.set(key, summary);
+        }
+      });
+  
+      const finalSummaries = Array.from(uniqueSummariesMap.values());
+  
+      return finalSummaries;
+  }
\ No newline at end of file
diff --git a/utils/saveMissingSummaries.js b/utils/saveMissingSummaries.js
new file mode 100644
index 0000000..2a8aaef
--- /dev/null
+++ b/utils/saveMissingSummaries.js
@@ -0,0 +1,23 @@
+import { supabase } from "../lib/supabaseClient";
+
+export async function saveMissingSummary(summaryData) {
+  let updates = {
+    workgroup_id: summaryData.workgroupId,
+    workgroup: summaryData.workgroup,
+    meeting_date: summaryData.meetingDate,
+    status: summaryData.status,
+    type: summaryData.type
+  }
+  
+  const { data, error } = await supabase
+    .from('missingsummaries')
+    .upsert(updates, { onConflict: ['workgroup_id', 'meeting_date', 'type'] })
+    .select('meeting_date, workgroup, updated_at');
+
+  if (error) {
+    console.error('Error upserting data:', error);
+    return false;
+  }
+
+  return data;
+}
diff --git a/utils/updateCSVInGitHub.js b/utils/updateCSVInGitHub.js
new file mode 100644
index 0000000..08b034f
--- /dev/null
+++ b/utils/updateCSVInGitHub.js
@@ -0,0 +1,89 @@
+// File: utils/githubCSVUtils.js
+import { Octokit } from "@octokit/rest";
+
+const octokit = new Octokit({ auth: process.env.GITHUB_TOKEN });
+
+export const fetchAndUpdateCSV = async ({ owner, repo, path, branch = 'main', summariesToUpdate }) => {
+  // Fetch the current CSV content
+  const { data: fileData } = await octokit.repos.getContent({
+    owner,
+    repo,
+    path,
+    ref: branch,
+  });
+  const currentCSV = Buffer.from(fileData.content, 'base64').toString('utf8');
+
+  // Update the CSV content based on allSummaries
+  const updatedCSV = updateCSVContent(currentCSV, summariesToUpdate);
+
+  // Encode the updated CSV content in Base64 for GitHub
+  const contentEncoded = Buffer.from(updatedCSV).toString('base64');
+
+  // Update the file on GitHub
+  const { data: updateResponse } = await octokit.repos.createOrUpdateFileContents({
+    owner,
+    repo,
+    path,
+    message: "Update CSV with new summaries",
+    content: contentEncoded,
+    sha: fileData.sha,
+    branch,
+  });
+
+  return updateResponse;
+};
+
+const updateCSVContent = (currentCSV, summariesToUpdate) => {
+  const lines = currentCSV.split('\n').filter(line => line.trim()); // Exclude empty lines
+  const headers = lines.shift().split(','); // Extract headers
+  let csvObjects = lines.map(line => line.split(',').reduce((acc, cur, i) => ({
+    ...acc,
+    [headers[i]]: cur,
+  }), {}));
+
+  // Create a map of existing summaries for quick lookup
+  let existingSummariesMap = new Map(csvObjects.map(obj => [`${obj.meetingDate}-${obj.workgroup}`, obj]));
+
+  // Iterate over allSummaries to update existing or add new entries
+  summariesToUpdate.forEach(summary => {
+    const key = `${summary.meetingDate}-${summary.workgroup}`;
+    if (existingSummariesMap.has(key)) {
+      // Update existing entry
+      const existingEntry = existingSummariesMap.get(key);
+      existingEntry.status = summary.status; // Assuming status is the field to update
+    } else {
+      // Add new entry
+      existingSummariesMap.set(key, summary);
+    }
+  });
+
+  // Convert the updated map back to CSV string
+  const updatedCSVObjects = Array.from(existingSummariesMap.values());
+  // Function to parse custom date format into a Date object
+  function parseCustomDate(dateString) {
+    const [day, month, year] = dateString.split(' ');
+    const monthIndex = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"].indexOf(month);
+    return new Date(year, monthIndex, day);
+  }
+
+  // Sort the objects by status ("Missing" at the top), then by date in descending order
+  updatedCSVObjects.sort((a, b) => {
+    // Sort by status
+    if (a.status === "Missing" && b.status !== "Missing") {
+      return -1;
+    } else if (a.status !== "Missing" && b.status === "Missing") {
+      return 1;
+    }
+
+    // Then sort by date within the same status group
+    const dateA = parseCustomDate(a.meetingDate);
+    const dateB = parseCustomDate(b.meetingDate);
+    return dateB - dateA; // Descending order
+  });
+
+  // Convert sorted objects back to CSV lines
+  const updatedCSVLines = updatedCSVObjects.map(obj => headers.map(header => obj[header] || "").join(','));
+  const updatedCSV = [headers.join(',')].concat(updatedCSVLines).join('\n');
+
+  return updatedCSV;
+};
\ No newline at end of file

From 12249e964390551acfd3b67f1f5729a8ddd15cbd Mon Sep 17 00:00:00 2001
From: Andre-Diamond <32074058+Andre-Diamond@users.noreply.github.com>
Date: Mon, 12 Feb 2024 14:36:34 +0200
Subject: [PATCH 3/3] Fix navigation and add reset button to clear summary

---
 components/nav.tsx                     |  5 ++---
 pages/submit-meeting-summary/index.tsx | 17 +++++++++++++++++
 styles/meetingsummary.module.css       | 18 ++++++++++++++++++
 utils/getsummaries.js                  |  4 ++--
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/components/nav.tsx b/components/nav.tsx
index c103a75..ec3b46c 100644
--- a/components/nav.tsx
+++ b/components/nav.tsx
@@ -110,7 +110,6 @@ const Nav = () => {
       });
     })
     .catch(error => console.error('Error:', error));
-  
   }, [session]);  
 
   async function saveUsername() {
@@ -129,9 +128,9 @@ const Nav = () => {
         <Link href='/issues' className="navitems">
           Issues
         </Link>
-        <Link href='/status-of-summaries' className="navitems">
+        {roleData?.appRole == "admin" && (<Link href='/status-of-summaries' className="navitems">
           Summaries
-        </Link>
+        </Link>)}
       </div>
       <div>{latestTag}</div>
       <div>
diff --git a/pages/submit-meeting-summary/index.tsx b/pages/submit-meeting-summary/index.tsx
index 266f453..af9b8da 100644
--- a/pages/submit-meeting-summary/index.tsx
+++ b/pages/submit-meeting-summary/index.tsx
@@ -220,6 +220,17 @@ useEffect(() => {
     });
   };
   
+  const resetSummary = () => {
+    setMyVariable(prevMyVariable => ({
+      ...prevMyVariable, 
+      summary: {
+        ...prevMyVariable.summary, 
+        meetingInfo: {}, 
+        agendaItems: [],
+        tags: {} 
+      }
+    }));
+  };  
 
   return (
     <div className={styles.container}>
@@ -277,6 +288,12 @@ useEffect(() => {
         {selectedWorkgroupId  && (<>
         {myVariable.roles?.isAdmin && (<button className={styles.navButton} onClick={() => setActiveComponent('two')}>Summary</button>)}
         {myVariable.roles?.isAdmin && <button className={styles.navButton} onClick={() => setActiveComponent('four')}>Archive Summaries</button>}
+        <button 
+          className={styles.resetButton} 
+          onClick={resetSummary}
+          title="All values will be cleared, so please make sure to select all dropdowns and fill in all fields"
+          >Clear Summary
+          </button>
         </>)}
       </div>
       {myVariable.isLoggedIn && selectedWorkgroupId  && (<div className={styles.mainContent}>
diff --git a/styles/meetingsummary.module.css b/styles/meetingsummary.module.css
index f42d277..2cb084e 100644
--- a/styles/meetingsummary.module.css
+++ b/styles/meetingsummary.module.css
@@ -95,6 +95,24 @@
   font-size: 1rem;
 }
 
+.resetButton {
+  width: 170px;
+  display: block;
+  padding: 0.5rem;
+  margin: 0.5rem 0;
+  text-align: center;
+  background-color: rgb(18, 105, 198);
+  border: none;
+  cursor: pointer;
+  color: white;
+  z-index: 9999;  
+  font-size: 1rem;
+}
+.resetButton:hover {
+  background-color: rgb(13, 64, 120);
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
 .navButton:focus {
   outline: 4px auto -webkit-focus-ring-color;
 }
diff --git a/utils/getsummaries.js b/utils/getsummaries.js
index 5d9f7b7..a21266e 100644
--- a/utils/getsummaries.js
+++ b/utils/getsummaries.js
@@ -49,9 +49,9 @@ export async function getSummaries(workgroup_id) {
         // Fetch the user details for each summary
         for (const data of summaryData) {
           // Exclude meetings where confirmed == true and all meetings with an earlier date and updated_at date than the last meeting where confirmed == true
-          if (data.confirmed === true || new Date(data.date) < new Date(lastConfirmedDate)) { //Might have to add this back in later - || new Date(data.updated_at) < new Date(lastUpdatedAt)
+          /*if (data.confirmed === true || new Date(data.date) < new Date(lastConfirmedDate)) { //Might have to add this back in later - || new Date(data.updated_at) < new Date(lastUpdatedAt)
             continue;
-          }
+          }*/
 
           const { data: userData, error: userError } = await supabase
             .from('users')