Nov changes

ytgov · Nov 9, 2023 · 5f38455 · 5f38455
1 parent d12ab4c
commit 5f38455
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 21 deletions.
diff --git a/src/api/src/routes/answer-router.ts b/src/api/src/routes/answer-router.ts
@@ -1,11 +1,6 @@
 import express, { Request, Response } from "express";
-import { ReturnValidationErrors } from "../middleware";
-import { param } from "express-validator";
-import * as knex from "knex";
-import { DB_CONFIG } from "../config";
-import { AnswerService, EmailService, ParticipantService } from "../services";
+import { AnswerService } from "../services";
 import { checkJwt, loadUser } from "../middleware/authz.middleware";
-import { Answer } from "src/data/models";
 
 export const answerRouter = express.Router();
 
@@ -17,7 +12,7 @@ answerRouter.get("/", async (req: Request, res: Response) => {
   res.json({ data: list });
 });
 
-answerRouter.put("/:id", async (req: Request, res: Response) => {
+answerRouter.put("/:id", checkJwt, loadUser, async (req: Request, res: Response) => {
   let { id } = req.params;
   let { CATEGORY, DELETED_FLAG, DONE_MODERATING, MODERATED_HEADER, MODERATED_TEXT, MODERATOR_NOTES } = req.body;
 
@@ -28,6 +23,7 @@ answerRouter.put("/:id", async (req: Request, res: Response) => {
     MODERATED_HEADER,
     MODERATED_TEXT,
     MODERATOR_NOTES,
+    MODERATED_BY: req.user.EMAIL,
   });
 
   res.json({ data: question });

diff --git a/src/api/src/services/answer-service.ts b/src/api/src/services/answer-service.ts
@@ -1,4 +1,4 @@
-import { sample, sampleSize, shuffle } from "lodash";
+import { sampleSize, shuffle } from "lodash";
 import { DB_SCHEMA, DB_ANSWER_TABLE, DB_RATING_TABLE } from "../config";
 import { db } from "../data";
 import { Answer } from "../data/models";

diff --git a/src/api/src/services/user-service.ts b/src/api/src/services/user-service.ts
@@ -14,7 +14,6 @@ export class UserService implements GenericService<User> {
   }
 
   async getByEmail(EMAIL: string): Promise<User | undefined> {
-    console.log("LOOKING BY EMAIL", EMAIL);
     if (EMAIL) {
       let user = await db<User>(DB_USER_TABLE).withSchema(DB_SCHEMA).where({ EMAIL }).first();
       return user;

diff --git a/src/web/src/modules/administration/modules/response/components/ResponseEditor.vue b/src/web/src/modules/administration/modules/response/components/ResponseEditor.vue
@@ -64,7 +64,12 @@
         </v-row>
       </v-card-text>
       <v-card-actions class="mx-4 mb-2">
-        <v-btn color="primary" variant="flat" @click="saveClick">Moderation Complete</v-btn>
+        <v-btn color="primary" variant="flat" @click="saveClick" class="mr-4"
+          ><v-icon class="mr-2">mdi-check</v-icon> Complete</v-btn
+        >
+        <v-btn color="primary" variant="flat" @click="saveNextClick" :disabled="!nextItem"
+          ><v-icon class="mr-2">mdi-arrow-right</v-icon> Complete and Next</v-btn
+        >
         <v-spacer></v-spacer>
         <v-btn color="yg_sun" variant="outlined" @click="close">Close</v-btn>
       </v-card-actions>
@@ -78,15 +83,23 @@ import { useResponseStore } from "../store";
 
 export default {
   name: "UserEditor",
+  props: ["items"],
   data: () => ({}),
   computed: {
     ...mapState(useResponseStore, ["response"]),
     visible() {
       return this.response ? true : false;
     },
+    nextItem() {
+      if (this.items?.length < 1) return undefined;
+
+      let otherItems = this.items?.filter((i: any) => i.ID != this.response?.ID);
+
+      return otherItems ? otherItems[0] : undefined;
+    },
   },
   methods: {
-    ...mapActions(useResponseStore, ["unselect", "update"]),
+    ...mapActions(useResponseStore, ["select", "unselect", "update"]),
     close() {
       this.unselect();
     },
@@ -99,6 +112,16 @@ export default {
         });
       }
     },
+    saveNextClick() {
+      if (this.response) {
+        this.response.DONE_MODERATING = 1;
+
+        this.update().then(() => {
+          if (this.nextItem) this.select(this.nextItem);
+          else this.close();
+        });
+      }
+    },
   },
 };
 </script>
diff --git a/src/web/src/modules/administration/modules/response/views/QuestionResponseList.vue b/src/web/src/modules/administration/modules/response/views/QuestionResponseList.vue
@@ -30,11 +30,22 @@
           style="max-width: 300px"></v-select>
       </template>
 
-      <v-data-table :search="search" :headers="headers" :items="filteredList" @click:row="rowClick"> </v-data-table>
+      <v-data-table :search="search" :headers="headers" :items="filteredList" @click:row="rowClick">
+        <template v-slot:item.DONE_MODERATING="{ item }">
+          {{ item.DONE_MODERATING == 1 ? "Yes" : "No" }}
+        </template>
+        <template v-slot:item.DELETED_FLAG="{ item }">
+          {{ item.DELETED_FLAG == 1 ? "Yes" : "No" }}
+        </template>
+        <template v-slot:item.MODERATED_TEXT="{ item }">
+          <span v-if="item.MODERATED_TEXT != item.ANSWER_TEXT" :class="`text-error`">{{ item.MODERATED_TEXT }}</span>
+          <span v-else>{{ item.MODERATED_TEXT }}</span>
+        </template>
+      </v-data-table>
     </base-card>
   </div>
 
-  <response-editor></response-editor>
+  <response-editor :items="filteredList"></response-editor>
 </template>
 <script lang="ts">
 import { mapActions, mapState } from "pinia";
@@ -48,7 +59,7 @@ export default {
   data: () => ({
     headers: [
       { title: "Category", key: "CATEGORY" },
-      { title: "Response", key: "ANSWER_TEXT" },
+      { title: "Response", key: "MODERATED_TEXT" },
       { title: "Deleted", key: "DELETED_FLAG" },
       { title: "Complete", key: "DONE_MODERATING" },
     ],

diff --git a/src/web/src/modules/administration/modules/response/views/ResponseList.vue b/src/web/src/modules/administration/modules/response/views/ResponseList.vue
@@ -16,7 +16,7 @@
 
   <h1>Responses</h1>
 
-      ** maybe moderators only see unmoderated, admins see all
+  ** maybe moderators only see unmoderated, admins see all
   <base-card showHeader="t" heading="">
     <template v-slot:left>
       <v-select
@@ -31,7 +31,6 @@
         style="width: 100px"></v-select>
     </template>
     <template v-slot:right>
-
       <v-select
         label="Status"
         :items="['Unmoderated', 'Moderated']"
@@ -42,10 +41,21 @@
         style="width: 100px"></v-select>
     </template>
 
-    <v-data-table :search="search" :headers="headers" :items="filteredList" @click:row="rowClick"> </v-data-table>
+    <v-data-table :search="search" :headers="headers" :items="filteredList" @click:row="rowClick">
+      <template v-slot:item.DONE_MODERATING="{ item }">
+        {{ item.DONE_MODERATING == 1 ? "Yes" : "No" }}
+      </template>
+      <template v-slot:item.DELETED_FLAG="{ item }">
+        {{ item.DELETED_FLAG == 1 ? "Yes" : "No" }}
+      </template>
+      <template v-slot:item.MODERATED_TEXT="{ item }">
+        <span v-if="item.MODERATED_TEXT != item.ANSWER_TEXT" :class="`text-error`">{{ item.MODERATED_TEXT }}</span>
+        <span v-else>{{ item.MODERATED_TEXT }}</span>
+      </template>
+    </v-data-table>
   </base-card>
 
-  <response-editor></response-editor>
+  <response-editor :items="filteredList"></response-editor>
 </template>
 <script lang="ts">
 import { mapActions, mapState } from "pinia";
@@ -58,7 +68,7 @@ export default {
   data: () => ({
     headers: [
       { title: "Category", key: "CATEGORY" },
-      { title: "Response", key: "ANSWER_TEXT" },
+      { title: "Response", key: "MODERATED_TEXT" },
       { title: "Deleted", key: "DELETED_FLAG" },
       { title: "Complete", key: "DONE_MODERATING" },
     ],
@@ -87,9 +97,9 @@ export default {
       }
 
       if (this.status == "Moderated") {
-        items = items.filter((i) => (i.DONE_MODERATING == 1));
+        items = items.filter((i) => i.DONE_MODERATING == 1);
       } else if (this.status == "Unmoderated") {
-        items = items.filter((i) => (i.DONE_MODERATING == 0));
+        items = items.filter((i) => i.DONE_MODERATING == 0);
       }
 
       return items;