From 650124395b8a42d2a52792492b59f7853bcdc1bf Mon Sep 17 00:00:00 2001
From: gsovereignty <gsovereignty@proton.me>
Date: Sat, 11 Nov 2023 13:29:26 +0800
Subject: [PATCH] problem: can't indicate that a problem has been patched

---
 .../soft_state/simplifiedProblems.ts          | 20 +++--
 src/routes/problems/[id]/+page.svelte         | 84 ++++++++++++-------
 2 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/src/lib/stores/nostrocket_state/soft_state/simplifiedProblems.ts b/src/lib/stores/nostrocket_state/soft_state/simplifiedProblems.ts
index cde899d..ba9f85c 100644
--- a/src/lib/stores/nostrocket_state/soft_state/simplifiedProblems.ts
+++ b/src/lib/stores/nostrocket_state/soft_state/simplifiedProblems.ts
@@ -63,15 +63,17 @@ export function handleProblemStatusChangeEvent(
         error =
           "you cannot mark this problem as patched unless you are the one who claimed it";
       }
-      state.Problems.forEach((p) => {
-        if (p.ClaimedBy == ev.pubkey) {
-          console.log(55);
-          error =
-            "this pubkey has claimed " +
-            p.UID +
-            ". Abandon or solve that first before claiming another problem.";
-        }
-      });
+      if (newStatus == "claimed") {
+        state.Problems.forEach((p) => {
+            if (p.ClaimedBy == ev.pubkey) {
+              console.log(55);
+              error =
+                "this pubkey has claimed " +
+                p.UID +
+                ". Abandon or solve that first before claiming another problem.";
+            }
+          }); 
+      }
       if (error == "") {
         problem.Status = newStatus;
         problem.ClaimedBy = ev.pubkey;
diff --git a/src/routes/problems/[id]/+page.svelte b/src/routes/problems/[id]/+page.svelte
index 62a3d97..8902ef9 100644
--- a/src/routes/problems/[id]/+page.svelte
+++ b/src/routes/problems/[id]/+page.svelte
@@ -148,8 +148,8 @@
                 ><DeliveryParcel /> PATCHED AND WAITING FOR VALIDATION</span
               >
             {/if}
-            {#if problem?.Status == "patched"}<span style="color:red"
-                ><Close /> PATCHED AND WAITING FOR VALIDATION</span
+            {#if problem?.Status == "closed"}<span style="color:red"
+                ><Close /> CLOSED</span
               >
             {/if}
           </p>
@@ -173,6 +173,10 @@
           {#if problem?.Status == "claimed"}<p style="color: #94a3b8">
               Claimed by <span style="color: #fb923c">{claimedBy?.name}</span>
             </p>{/if}
+
+            {#if problem?.Status == "patched"}<p style="color: #94a3b8">
+                Patched by <span style="color: #fb923c">{claimedBy?.name}</span>
+              </p>{/if}
         </Column>
       </Row>
 
@@ -182,40 +186,62 @@
         </Column>
       </Row>
 
-      <Row padding>
+      <Row>
         <Column>
+            
           <LogNewProblemModal parent={problem} />
-        </Column>
-      </Row>
+          {#if claimable} 
+          <br /><br />
+          <Button
+          icon={PlayFilledAlt}
+          size="small"
+          kind="primary"
+          on:click={() => {
+            updateStatus("claimed")
+              .then((response) => {
+                console.log(response);
+              })
+              .catch((response) => {
+                console.log(response);
+                statusErrorText = response;
+              });
+          }}>Claim this problem and work on it now</Button
+        >
+        {/if}
 
-      <Row>
-        <Column>
+        {#if problem?.Status == "claimed"}
+        <br /><br />
           <Button
-            disabled={!claimable}
-            icon={PlayFilledAlt}
-            size="small"
-            kind="primary"
-            on:click={() => {
-              updateStatus("claimed")
-                .then((response) => {
-                  console.log(response);
-                })
-                .catch((response) => {
-                  console.log(response);
-                  statusErrorText = response;
-                });
-            }}>Claim this problem and work on it now</Button
-          >
+          disabled={!(problem?.ClaimedBy == $currentUser?.pubkey)}
+          icon={PlayFilledAlt}
+          size="small"
+          kind="primary"
+          on:click={() => {
+            updateStatus("patched")
+              .then((response) => {
+                console.log(response);
+              })
+              .catch((response) => {
+                console.log(response);
+                statusErrorText = response;
+              });
+          }}>Mark this problem as patched and ready for review</Button
+        >
+        {/if}
+
+
+      {#if statusErrorText}
+      <InlineNotification
+        title="Error:"
+        subtitle={statusErrorText}
+        on:close={(statusErrorText = undefined)}
+      />
+    {/if}
+
 
-          {#if statusErrorText}
-            <InlineNotification
-              title="Error:"
-              subtitle={statusErrorText}
-              on:close={(statusErrorText = undefined)}
-            />
-          {/if}
         </Column>
       </Row>
+
     </Column>
   </Row>
 {:else}