Merge branch 'master' of github.com:RunestoneInteractive/RunestoneServer

Author: bnmnetp

docker/README.rst

@@ -42,7 +42,7 @@ Open a Terminal. In the Terminal:
 
 #.  Edit ``/etc/paths``; add ``/opt/homebrew/bin`` as the first line in that file.
 #.  `Install Homebrew <https://brew.sh/#install>`_.
-#.  Execute ``brew install python docker``.
+#.  Execute ``brew install python docker md5sha1sum``.
 #.  Run the newly-installed Docker Desktop application.
 
     .. note::

docker/gunicorn_config/fastapi_config.py

@@ -33,7 +33,10 @@
 wsgi_app = "bookserver.main:app"
 
 # `workers <https://docs.gunicorn.org/en/stable/settings.html#workers>`_: The number of worker processes for handling requests. Pick this based on CPU count.
-workers = multiprocessing.cpu_count() * 2 + 1
+if os.environ["BOOK_SERVER_CONFIG"] == "development":
+    workers = 4
+else:
+    workers = multiprocessing.cpu_count() * 2 + 1
 
 # `worker_class <https://docs.gunicorn.org/en/stable/settings.html#worker-class>`_: The type of workers to use. Use `uvicorn's worker class for gunicorn <https://www.uvicorn.org/deployment/#gunicorn>`_.
 worker_class = "uvicorn.workers.UvicornWorker"

docker/gunicorn_config/web2py_config.py

@@ -32,7 +32,10 @@
 wsgi_app = "wsgihandler:application"
 
 # `workers <https://docs.gunicorn.org/en/stable/settings.html#workers>`_: The number of worker processes for handling requests. Pick this based on CPU count.
-workers = multiprocessing.cpu_count()
+if os.environ["BOOK_SERVER_CONFIG"] == "development":
+    workers = 4
+else:
+    workers = multiprocessing.cpu_count()
 
 # `bind <https://docs.gunicorn.org/en/stable/settings.html#bind>`_: The socket to bind. This must match the socket nginx sends to.
 bind = "unix:/run/web2py.sock"

rsmanage/rsmanage.py

@@ -827,22 +827,28 @@ def studentinfo(config, student):
         student = click.prompt("Student Id: ")
 
     res = eng.execute(
+        ## Index  0             1           2         3            4               5                6
         f"""
-        select auth_user.id, first_name, last_name, email, courses.course_name, courses.id
-        from auth_user join user_courses ON user_courses.user_id = auth_user.id
+        select auth_user.id, first_name, last_name, email, courses.course_name, courses.id, payments.charge_id
+        from auth_user
+        join user_courses on user_courses.user_id = auth_user.id
+        full outer join payments on user_courses.id = payments.user_courses_id
         join courses on courses.id = user_courses.course_id where username = '{student}'"""
     )
     # fetchone fetches the first row without closing the cursor.
     first = res.fetchone()
-    print("id\tFirst\tLast\temail")
-    print("\t".join(str(x) for x in first[:4]))
-    print("")
-    print("         Course        cid")
-    print("--------------------------")
-    print(f"{first[-2].rjust(15)} {str(first[-1]).rjust(10)}")
-    if res:
+    if first:
+        print("id\tFirst\tLast\temail")
+        print("\t".join(str(x) for x in first[:4]))
+        print("")
+        print("Course                                     cid")
+        print("----------------------------------- ----------")
+        print(f"{first[4].ljust(35)} {str(first[5]).rjust(10)} {first[6] if first[6] is not None else ''}")
         for row in res:
-            print(f"{row[-2].rjust(15)} {str(row[-1]).rjust(10)}")
+            print(f"{row[4].ljust(35)} {str(row[5]).rjust(10)} {row[6] if row[6] is not None else ''}")
+        print("\n")
+    else:
+        print("Student not found.")
 
 
 @cli.command()

views/peer/student.html

@@ -30,4 +30,4 @@ <h2></h2>
     {{pass}}
 </table>
 
-<p><b>Note:</b> The "After Class" version of the assignment is only for use outside of and AFTER the class it was introduced.  You will be able to vote for each question twice and review a chat trascript from a group that was recorded during class.</p>
+<p><b>Note:</b> The "After Class" version of the assignment is only for use outside of and AFTER the class it was introduced.  You will be able to vote for each question twice and review a chat transcript from a group that was recorded during class.</p>