From ac783a8df38461503ed31269af4146c9854a12c0 Mon Sep 17 00:00:00 2001 From: githubmamatha Date: Mon, 17 Jun 2024 12:01:06 -0700 Subject: [PATCH 01/11] Grad2-2622 Fine Arts Applied Skills code table on Codes tab. --- .../Codes/FineArtsAppliedSkillsCodes.vue | 87 +++++++++++++++++++ frontend/src/router/index.js | 8 ++ frontend/src/services/CourseService.js | 3 + frontend/src/views/Codes.vue | 34 ++++++++ 4 files changed, 132 insertions(+) create mode 100644 frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue diff --git a/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue b/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue new file mode 100644 index 00000000..b136b4ce --- /dev/null +++ b/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue @@ -0,0 +1,87 @@ + + + + + diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index e896d303..45279dce 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -20,6 +20,7 @@ import UngradReasons from "../components/Codes/UngradReasons.vue"; import HistoryActivityCodes from "../components/Codes/HistoryActivityCodes.vue"; import DocumentStatusCode from "../components/Codes/DocumentStatusCode.vue"; import BatchTypes from "../components/Codes/BatchTypes.vue"; +import FineArtsAppliedSkillsTypes from "../components/Codes/FineArtsAppliedSkillsCodes.vue"; // Programs import AdminGraduationPrograms from "../views/Programs.vue"; import AlgorithmRules from "../components/Programs/AlgorithmRules.vue"; @@ -351,6 +352,13 @@ const router = createRouter({ requiresAuth: true, }, }, + { + path: "/codes/fine-arts-applied-skills", + component: FineArtsAppliedSkillsTypes, + meta: { + requiresAuth: true, + }, + }, ], meta: { requiresAuth: true, diff --git a/frontend/src/services/CourseService.js b/frontend/src/services/CourseService.js index 43aeccf8..966a03c5 100644 --- a/frontend/src/services/CourseService.js +++ b/frontend/src/services/CourseService.js @@ -44,4 +44,7 @@ export default { "/api/v1/course/studentexam/pen/" + pen + "?sortForUI=true" ); }, + getFineArtsAppliedSkillsTypes() { + return ApiService.apiAxios.get("/api/v1/course/fineArtsAppliedSkillsCodes"); + }, }; diff --git a/frontend/src/views/Codes.vue b/frontend/src/views/Codes.vue index 5ab184fa..946b6f8b 100644 --- a/frontend/src/views/Codes.vue +++ b/frontend/src/views/Codes.vue @@ -103,6 +103,12 @@ @click="tab = 7" >Batch Type Codes + Fine Arts Applied Skills Code @@ -123,6 +129,7 @@ import GraduationReportService from "@/services/GraduationReportService.js"; import StudentService from "@/services/StudentService.js"; import ProgramManagementService from "@/services/ProgramManagementService.js"; import BatchProcessingService from "@/services/BatchProcessingService.js"; +import CourseService from "@/services/CourseService"; export default { name: "codes", @@ -148,6 +155,19 @@ export default { sortable: true, }, ], + fineArtsAppliedSkillsTypes: [], + fineArtsAppliedSkillsTypesFields: [ + { + key: "code", + label: "Code", + sortable: true, + }, + { + key: "label", + label: "Label", + sortable: true, + }, + ], reportSignaturesFields: [ { key: "signatureContent", @@ -328,6 +348,7 @@ export default { this.getStudentStatusCodes(); this.getUngradReasons(); this.getBatchJobTypes(); + this.getFineArtsAppliedSkillsTypes(); }, methods: { closeDropdown(dropdown) { @@ -420,6 +441,19 @@ export default { }); }); }, + getFineArtsAppliedSkillsTypes() { + console.log(CourseService.getFineArtsAppliedSkillsTypes() + .then((response) => { + this.fineArtsAppliedSkillsTypes = response.data; + }) + .catch((error) => { + this.$bvToast.toast("ERROR " + error.response.statusText, { + title: "ERROR" + error.response.status, + variant: "danger", + noAutoHide: true, + }); + })); + }, getUngradReasons() { StudentService.getUngradReasons() .then((response) => { From fdb5b3043a83373c92fa401c8f27c4eb389e1191 Mon Sep 17 00:00:00 2001 From: suzalflueck Date: Mon, 17 Jun 2024 15:23:40 -0700 Subject: [PATCH 02/11] Updated FaAs code key and applied displayOrder sort --- .../Codes/FineArtsAppliedSkillsCodes.vue | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue b/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue index b136b4ce..9fb8f3c5 100644 --- a/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue +++ b/frontend/src/components/Codes/FineArtsAppliedSkillsCodes.vue @@ -1,13 +1,12 @@