From 6b9a6347836ab71cd7ec514ca6be8bc4d89a4516 Mon Sep 17 00:00:00 2001
From: Thomas Sparks <69657545+thsparks@users.noreply.github.com>
Date: Mon, 6 May 2024 14:08:54 -0700
Subject: [PATCH] Port teacher tool common docs changes to v10 (#9993)

* Port common docs changes to v10 again

* Remove extra var validation, add number zero validation
---
 common-docs/teachertool/catalog-shared.json | 64 ++++++++++-----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/common-docs/teachertool/catalog-shared.json b/common-docs/teachertool/catalog-shared.json
index 0b33bb96a1d..883162e77ca 100644
--- a/common-docs/teachertool/catalog-shared.json
+++ b/common-docs/teachertool/catalog-shared.json
@@ -1,37 +1,5 @@
 {
     "criteria": [
-        {
-            "id": "D21D76A2-D9FD-4F9B-B0AC-973CB870EA78",
-            "use": "variable_set",
-            "template": "At least one custom variable is set",
-            "docPath": "/teachertool",
-            "description": "At least one user-defined variable is set to a value.",
-            "maxCount": 1
-        },
-        {
-            "id": "0173898D-8A48-4266-AAB9-CE934471A734",
-            "use": "variable_accessed",
-            "template": "At least one variable is accessed",
-            "docPath": "/teachertool",
-            "description": "At least one variable's value is read.",
-            "maxCount": 1
-        },
-        {
-            "id": "7AE7EA2A-3AC8-42DC-89DB-65E3AE157156",
-            "use": "block_comment_used",
-            "template": "At least ${count} comments",
-            "description": "The project contains at least the specified number of comments.",
-            "docPath": "/teachertool",
-            "maxCount": 1,
-            "params": [
-                {
-                    "name": "count",
-                    "type": "number",
-                    "default": 1,
-                    "paths": ["checks[0].count"]
-                }
-            ]
-        },
         {
             "id": "59AAC5BA-B0B3-4389-AA90-1E767EFA8563",
             "use": "block_used_n_times",
@@ -52,6 +20,22 @@
                 }
             ]
         },
+        {
+            "id": "7AE7EA2A-3AC8-42DC-89DB-65E3AE157156",
+            "use": "block_comment_used",
+            "template": "At least ${count} comments",
+            "description": "The project contains at least the specified number of comments.",
+            "docPath": "/teachertool",
+            "maxCount": 1,
+            "params": [
+                {
+                    "name": "count",
+                    "type": "number",
+                    "default": 1,
+                    "paths": ["checks[0].count"]
+                }
+            ]
+        },
         {
             "id": "B8987394-1531-4C71-8661-BE4086CE0C6E",
             "use": "n_loops",
@@ -83,6 +67,22 @@
                     "default": 1
                 }
             ]
+        },
+        {
+            "id": "0DFA44C8-3CA5-4C77-946E-AF09F6C03879",
+            "use": "variable_usage",
+            "template": "Uses at least ${count} variables",
+            "docPath": "/teachertool",
+            "description": "The program creates and uses at least this many user-defined variables.",
+            "maxCount": 1,
+            "params": [
+                {
+                    "name": "count",
+                    "type": "number",
+                    "paths": ["checks[0].count"],
+                    "default": 1
+                }
+            ]
         }
     ]
 }