rubric: new format, comp qs -> reflection

Author: tildeee

.github/PULL_REQUEST_TEMPLATE

@@ -1,7 +1,8 @@
-# Adagrams
-Congratulations! You're submitting your assignment.
+# Assignment Submission: Adagrams
 
-## Comprehension Questions
+Congratulations! You're submitting your assignment. Please reflect on the assignment with these questions.
+
+## Reflection
 
 Feature | Feedback
 --- | ---

feedback.md

@@ -1,21 +1,50 @@
-# Adagrams
-## What We're Looking For
-
-Feature | Feedback
---- | ---
-**General** |
-Answered comprehension questions |
-Small commits with meaningful commit messages |
-**Code Requirements** |
-`draw_letters` method |
-Uses appropriate data structure to store the letter distribution |
-All tests for `draw_letters` pass |
-`uses_available_letters?` method |
-All tests for `uses_available_letters?` pass |
-`score_word` method |
-Uses appropriate data structure to store the letter scores |
-All tests for `score_word` pass |
-`highest_score_from` method |
-Appropriately handles edge cases for tie-breaking logic |
-All tests for `highest_score_from` pass |
-**Overall** |
+# Calculator
+
+<!-- Instructors: The checkmarks are already there, so just delete them for any line items that aren't met. -->
+
+## Major Learning Goals/Code Review
+
+<!-- Instructors: Feel free to practice creating specific feedback by referencing a line of code if you'd like. For example, you may say something like "nice custom method in `calculator.rb` line 42." This is optional. -->
+
+| Criteria | yes/no, and optionally any details/lines of code to reference |
+| --- | --- |
+| Correctly creates and calls methods with proper syntax (parameters, return statements, etc.) | ✔️
+| Uses correct syntax for conditional logic and iteration | ✔️
+| Practices git with at least 3 small commits and meaningful commit messages | ✔️
+| Utilizes unit tests to verify code; tests can run using the command `$ rake` and we see test successes and/or failures | ✔️
+| Practices pair programming; the reflection question on pair programming is answered | ✔️
+
+## Functional Requirements
+
+| Functional Requirement | yes/no |
+| --- | --- |
+| For the `draw_letters` method, there is an appropriate data structure to store the letter distribution. (You are more likely to draw an 'E' than an 'X'.) | ✔️
+| Utilizes unit tests to verify code; all tests for `draw_letters` and `uses_available_letters?` pass | ✔️
+| Utilizes unit tests to verify code; all tests for `score_word` pass | ✔️
+| Utilizes unit tests to verify code; all tests for `highest_score_from` pass | ✔️
+
+## Overall Feedback
+
+| Overall Feedback | Criteria | yes/no |
+| --- | --- | --- |
+| Green (Meets/Exceeds Standards) | 4+ in Code Review && 3+ in Functional Requirements | ✔️
+| Yellow (Approaches Standards) | 3+ in Code Review && 2+ in Functional Requirements | ✔️
+| Red (Not at Standard) | 0-2 in Code Review or 0,1 in Functional Reqs, or assignment is breaking/doesn’t run with less than 5 minutes of debugging | ✔️
+
+<!-- ### Additional Feedback -->
+
+<!-- Instructors, feel free to ignore this section if there's nothing else to add. -->
+
+## Code Style Bonus Awards
+
+<!-- Instructors: Please strike a balance between liberal/stingy with these. These are simply built-in pieces of positive feedback; use this to encourage and push students towards a cleaner code style! -->
+
+Was the code particularly impressive in code style for any of these reasons (or more...?)
+
+| Quality | Yes? |
+| --- | --- |
+| Perfect Indentation | ✅
+| Elegant/Clever | ✅
+| Descriptive/Readable | ✅
+| Concise | ✅
+| Logical/Organized | ✅