Version 3.1.0

package.json

@@ -1,6 +1,6 @@
 {
  "name": "la-feedback-system",
- "version": "3.0.1",
+ "version": "3.1.0",
  "repository": "https://github.com/hbiede/LA-Feedback-System",
  "readme": "./README.md",
  "private": true,

public/admin.php

@@ -127,14 +127,15 @@ function get_outstanding_feedback() {
 
 function get_interactions() {
  $conn = get_connection();
- $ps = $conn->prepare('SELECT IFNULL(canvas_username, username) AS \'username\', CONCAT(name, IF(is_admin, \' (Admin)\', \'\')) AS \'name\', ' .
- 'cse_usernames.course, COUNT(i.interaction_key) AS count, COUNT(t.interaction_key) AS wCount, ' .
- 'COUNT(f.feedback_key) AS fCount, ' .
- 'AVG(rating) AS avg, AVG(sentiment) AS sentiment FROM cse_usernames ' .
- 'LEFT JOIN interactions i on cse_usernames.username_key = i.la_username_key ' .
- 'LEFT JOIN feedback f on i.interaction_key = f.interaction_key ' .
- 'LEFT JOIN (SELECT interaction_key FROM interactions WHERE interactions.time_of_interaction >= CURDATE() - INTERVAL 7 DAY) t on t.interaction_key = i.interaction_key ' .
- 'GROUP BY username ORDER BY username;');
+ $ps = $conn->prepare("SELECT IFNULL(canvas_username, username) AS 'username', CONCAT(name, IF(is_admin, ' (Admin)', '')) AS 'name', " .
+ "cse_usernames.course, COUNT(i.interaction_key) AS count, COUNT(t.interaction_key) AS wCount, " .
+ "COUNT(f.feedback_key) AS fCount, " .
+ "AVG(rating) AS avg, AVG(sentiment) AS sentiment " .
+ "FROM cse_usernames " .
+ "LEFT JOIN interactions i on cse_usernames.username_key = i.la_username_key " .
+ "LEFT JOIN feedback f on i.interaction_key = f.interaction_key " .
+ "LEFT JOIN (SELECT interaction_key FROM interactions WHERE interactions.time_of_interaction >= CURDATE() - INTERVAL 7 DAY) t on t.interaction_key = i.interaction_key " .
+ "GROUP BY canvas_username HAVING COUNT(i.interaction_key) > 0 ORDER BY canvas_username;");
  $returnVal = [];
  if ($ps) {
  $ps->execute();

public/data/tableSetup.sql

@@ -39,6 +39,7 @@ CREATE TABLE interactions
  student_username_key int not null,
  course varchar(10),
  interaction_type varchar(30) null,
+ was_recommended tinyint(1) default 0 not null,
  seeking_feedback tinyint(1) default 0 not null,
  has_received_feedback tinyint(1) default 0 null,
  time_of_interaction timestamp default current_timestamp() not null,
@@ -92,6 +93,7 @@ SELECT time_of_interaction,
  IFNULL(cus.name, cus.username) AS 'student',
  i.course,
  interaction_type,
+ IF(was_recommended, 'Recommended', 'Not Recommended') AS 'recommendation_status',
  seeking_feedback,
  has_received_feedback
 FROM interactions i

public/interactionDownload.php

@@ -11,7 +11,8 @@ function send_interactions_csv() {
  "i.course, " .
  "interaction_type, " .
  "seeking_feedback, " .
- "has_received_feedback " .
+ "has_received_feedback, " .
+ "IF(was_recommended, 'Recommended', 'Not Recommended') AS 'recommendation_status' " .
  "FROM interactions i " .
  "LEFT JOIN cse_usernames cul on i.la_username_key = cul.username_key " .
  "LEFT JOIN cse_usernames cus on i.student_username_key = cus.username_key " .

public/sendEmail.php

@@ -19,7 +19,8 @@
 // studentID: string,
 // laCSE: string,
 // course: string,
-// interactionType: string | null
+// interactionType: string | null,
+// recommended?: boolean,
 //}
 
 // Returns a JSON encoded message as follows:
@@ -67,7 +68,7 @@ function send_email($obj, $interaction_id) {
 
 $obj = json_decode(file_get_contents('php://input'));
 if (isset($obj) && isset($obj->{'laCSE'}) && isset($obj->{'studentID'}) && isset($obj->{'course'})) {
- $interaction_id = add_interaction($obj->{'laCSE'}, $obj->{'studentID'}, $obj->{'course'}, $obj->{'interactionType'});
+ $interaction_id = add_interaction($obj->{'laCSE'}, $obj->{'studentID'}, $obj->{'course'}, $obj->{'interactionType'}, isset($obj->{'recommended'}) && ($obj->{'recommended'} === true || $obj->{'recommended'} === 'true'));
 
  if ($interaction_id !== null && $interaction_id > 0 &&
  (has_been_a_week($obj->{'laCSE'}) || mt_rand() / mt_getrandmax() < FEEDBACK_RATE) &&

public/sqlManager.php

@@ -172,16 +172,17 @@ function add_cse($username, $name = null, $email = null) {
  return null;
 }
 
-function add_interaction($la_cse, $student_id, $course, $interaction_type) {
+function add_interaction($la_cse, $student_id, $course, $interaction_type, $recommended = false) {
  $la_id = get_username_id($la_cse);
  if ($la_id === $student_id) return null;
  $conn = get_connection();
  if ($conn !== null && is_int($la_id) && is_int($student_id) && $la_id >= 0) {
  $conn->begin_transaction();
  $ps = $conn->prepare("INSERT INTO interactions (la_username_key, student_username_key, course, " .
- "interaction_type) VALUE (?, ?, ?, ?);");
+ "interaction_type, was_recommended) VALUE (?, ?, ?, ?, ?);");
  if ($ps) {
- $ps->bind_param("siss", $la_id, $student_id, $course, $interaction_type);
+ $recommended_int = $recommended ? 1 : 0;
+ $ps->bind_param("sissi", $la_id, $student_id, $course, $interaction_type, $recommended_int);
  $ps->execute();
  if ($ps->error) {
  error_log($ps->error);

src/CHANGELOG.json

@@ -1,5 +1,6 @@
 {
  "changes": [
+ "## 3.1.0\n- Allow LAs to submit a student as a potential LA for the PC to reach out to in the future\n- Fix error of students being attributed interactions in the admin table",
  "## 3.0.1\n- Prevent removing the super user as an admin\n- Allow sorting by course on Admin's Students tab",
  "## 3.0.0\n- Convert to UNL's authentication system",
  "## 2.2.1\n- Fix error with removing admins",

src/components/AdminComponents/LASummaryTable.tsx

@@ -278,7 +278,7 @@ const LASummaryTable = ({ showLA }: Props) => {
  href={`${ServiceInterface.getPath()}/interactionDownload.php`}
  type="button"
  variant="primary"
- style={{ marginBottom: 20 }}
+ style={{ marginBottom: 20, marginLeft: 10 }}
  >
  Download Interactions as CSV
  </Button>

src/redux/actions/LogInteraction.ts

@@ -14,12 +14,14 @@ import ServiceInterface from 'statics/ServiceInterface';
  * @param course The course for which the student had an interaction
  * @param multiples If the LA logged multiple students at once
  * @param interactionType The type of interaction (i.e., 'office hour', 'lab')
+ * @param recommended If the student was recommended by the LA
  */
 const LogInteraction = (
  studentID: number,
  course: string | null = null,
  multiples = false,
- interactionType: string | null = null
+ interactionType: string | null = null,
+ recommended = false
 ) => {
  const { setResponse, username } = api.getState();
  if (studentID === null) {
@@ -37,7 +39,12 @@ const LogInteraction = (
  return;
  }
 
- ServiceInterface.logInteraction(studentID, course, interactionType)
+ ServiceInterface.logInteraction(
+ studentID,
+ course,
+ interactionType,
+ recommended
+ )
  .then((response) => {
  if (response === '0' || response === 0) {
  setResponse({

src/redux/modules/index.ts

@@ -131,12 +131,14 @@ export type AppReduxState = {
  * @param course The course for which the student had an interaction
  * @param multiples If the LA logged multiple students at onces
  * @param interactionType The type of interaction (i.e., 'office hour', 'lab')
+ * @param recommended If the student was recommended by the LA
  */
  logInteraction: (
  studentID: number,
  course?: string | null,
  multiples?: boolean,
- interactionType?: string | null
+ interactionType?: string | null,
+ recommended?: boolean
  ) => void;
  /**
  * Logs the current user out

src/screens/FeedbackForm.tsx

@@ -32,11 +32,14 @@ const LA_USERNAME_ID = 'la_username';
 const COURSE_ID = 'course';
 const STUDENT_ID = 'student_login';
 const INTERACTION_TYPE_ID = 'interaction_type';
+const RECOMMENDED_ID = 'recommended_checkbox';
 
 const LA_LABEL = 'LA Canvas Username';
 const COURSE_LABEL = 'Course';
 const STUDENT_LABEL = 'Student';
 const INTERACTION_TYPE_LABEL = 'Interaction Type';
+const RECOMMENDED_LABEL =
+ 'Would you recommend this student as a potential LA? (The PC will reach out to them)';
 
 type Props = {
  style?: CSSProperties;
@@ -92,6 +95,7 @@ const FeedbackForm = ({ style }: Props) => {
  const [interactionTypeRecord, setInteractionTypeRecord] = useState<
  string | null
  >(course);
+ const [recommended, setRecommended] = useState(false);
 
  useEffect(() => {
  api.subscribe(
@@ -121,6 +125,11 @@ const FeedbackForm = ({ style }: Props) => {
  case INTERACTION_TYPE_ID:
  setInteractionTypeRecord(value);
  break;
+ case RECOMMENDED_ID:
+ setRecommended(
+ (event as ChangeEvent<HTMLInputElement>).currentTarget.checked
+ );
+ break;
  default:
  setResponse({ content: `${id} is an invalid ID`, class: 'danger' });
  break;
@@ -159,7 +168,8 @@ const FeedbackForm = ({ style }: Props) => {
  student.id,
  student.course,
  students.length > 1,
- interactionTypeRecord
+ interactionTypeRecord,
+ recommended
  );
  });
  setStudents([]);
@@ -182,6 +192,7 @@ const FeedbackForm = ({ style }: Props) => {
 
  // Prevent reload
  event.preventDefault();
+ setRecommended(false);
  return false;
  },
  [
@@ -191,9 +202,10 @@ const FeedbackForm = ({ style }: Props) => {
  interactionTypeRecord,
  usernameRecord,
  isAdmin,
- incrementSessionInteractions,
  setSelectedUsername,
+ incrementSessionInteractions,
  logInteraction,
+ recommended,
  ]
  );
 
@@ -329,6 +341,19 @@ const FeedbackForm = ({ style }: Props) => {
  </div>
  </FormGroup>
 
+ <FormGroup as={Row} controlId={RECOMMENDED_ID}>
+ <div className="col-sm-9">
+ <Form.Check
+ type="checkbox"
+ label={RECOMMENDED_LABEL}
+ checked={recommended}
+ aria-label={RECOMMENDED_LABEL}
+ aria-checked={recommended}
+ onChange={handleChange}
+ />
+ </div>
+ </FormGroup>
+
  <FormGroup>
  <div className="col-sm-9">
  <Button

src/statics/ServiceInterface.ts

@@ -17,11 +17,13 @@ class ServiceInterface {
  * @param studentID The database ID of the student being logged
  * @param course The course for which the student had an interaction
  * @param interactionType The type of interaction (i.e., 'office hour', 'lab')
+ * @param recommended If the student was recommended by the LA
  */
  static logInteraction = async (
  studentID: number,
  course: string | null = null,
- interactionType: string | null = null
+ interactionType: string | null = null,
+ recommended = false
  ): Promise<string | number | null> => {
  const { course: defaultCourse, setResponse } = api.getState();
  const laCSE = ServiceInterface.getActiveUser();
@@ -39,6 +41,7 @@ class ServiceInterface {
  ? defaultCourse
  : course,
  interactionType,
+ recommended,
  }),
  };
  let status = null;