diff --git a/src/api/evaluate/api.evaluate.ts b/src/api/evaluate/api.evaluate.ts index b8ae7c5..61df36e 100644 --- a/src/api/evaluate/api.evaluate.ts +++ b/src/api/evaluate/api.evaluate.ts @@ -1,3 +1,23 @@ import env from "../index"; -export default {}; +const evaluation = `${env.API_URI}/evaluation`; + +export default { + evaluationCheckStatus: () => `${evaluation}/check-status`, + evaluationCheckById: (id: string) => `${evaluation}/check/${id}`, + evaluationCheckspec: () => `${evaluation}/check-spec`, + evaluationCheckspecByid: (id: string) => `${evaluation}/check-spec/${id}`, + evaluationPerparedoc: (id: string, type: string) => + `${evaluation}/perpare-doc-v1/${type}/${id}`, + evaluationCheckdoc: (id: string, type: string) => + `${evaluation}/check-doc-v1/${type}/${id}`, + evaluationDoc1: (id: string, type: string) => + `${evaluation}/doc1/${type}/${id}`, + evaluationCheckdocV1: (id: string) => `${evaluation}/check-doc-v1/${id}`, + evaluationPerparedocV2: (id: string) => `${evaluation}/perpare-doc-v2/${id}`, + evaluationPerparedocRejectV2: (id: string) => + `${evaluation}/perpare-doc-v2/reject/${id}`, + evaluationWaitCheck: (id: string) => `${evaluation}/wait-check-doc-v2/${id}`, + evaluationDoc2: (id: string) => `${evaluation}/doc2/reject/${id}`, + evaluationHistory: (id: string) => `${evaluation}/step-history/${id}`, +}; diff --git a/src/modules/06_evaluate/components/Stepper.vue b/src/modules/06_evaluate/components/Stepper.vue index 965245c..81f3b12 100644 --- a/src/modules/06_evaluate/components/Stepper.vue +++ b/src/modules/06_evaluate/components/Stepper.vue @@ -24,10 +24,20 @@ const store = useEvaluateStore(); > - + - + import { ref, reactive, onMounted } from "vue"; import { useQuasar } from "quasar"; +import evaluationFunctions from "@/modules/06_evaluate/stores/evaluationFunction"; import type { FormCommand, @@ -29,10 +30,11 @@ import { useCounterMixin } from "@/stores/mixin"; const store = useEvaluateStore(); const mixin = useCounterMixin(); -const { dialogConfirm } = mixin; - const $q = useQuasar(); +const { dialogConfirm, showLoader, hideLoader, messageError } = mixin; +const { fetchCheckStatus, saveEvaluation } = evaluationFunctions; + const externalLink = "https://accreditation.ocsc.go.th/accreditation/search/curriculum"; @@ -136,7 +138,7 @@ async function validateStep2() { } async function saveStep1() { - console.log("Save 1"); + saveEvaluation("test"); } async function saveStep2() { dialogConfirm( @@ -187,8 +189,9 @@ function fetchMeeting() { console.log("ประเมินชำนาญการ:meeting"); } -onMounted(() => { +onMounted(async () => { store.step = 1; + await fetchCheckStatus(); }); diff --git a/src/modules/06_evaluate/components/Tab2.vue b/src/modules/06_evaluate/components/Tab2.vue index aef5b68..ea605cb 100644 --- a/src/modules/06_evaluate/components/Tab2.vue +++ b/src/modules/06_evaluate/components/Tab2.vue @@ -1,6 +1,7 @@ diff --git a/src/modules/06_evaluate/store.ts b/src/modules/06_evaluate/store.ts index 456e1ff..e26dd3e 100644 --- a/src/modules/06_evaluate/store.ts +++ b/src/modules/06_evaluate/store.ts @@ -18,6 +18,8 @@ export const useEvaluateStore = defineStore("evaluateStore", () => { const tabPanels = ref("1"); + const evaluateId = ref(""); + return { tabMenu, step, diff --git a/src/modules/06_evaluate/stores/evaluationFunction.ts b/src/modules/06_evaluate/stores/evaluationFunction.ts new file mode 100644 index 0000000..7df3e64 --- /dev/null +++ b/src/modules/06_evaluate/stores/evaluationFunction.ts @@ -0,0 +1,45 @@ +import http from "@/plugins/http"; +import config from "@/app.config"; +import { useQuasar } from "quasar"; + +import { useCounterMixin } from "@/stores/mixin"; +import { useEvaluateStore } from "@/modules/06_evaluate/store"; + +const stroe = useEvaluateStore(); +const mixin = useCounterMixin(); +const $q = useQuasar(); + +const { showLoader, hideLoader, messageError } = mixin; + +async function fetchCheckStatus() { + console.log(stroe.tabMenu); + showLoader(); + await http + .get(config.API.evaluationCheckStatus()) + .then((res) => { + console.log(res); + // stroe.tabMenu === 1 ? stroe.evaluateId = 1 : stroe.evaluateId = 2 + }) + .catch((err) => { + messageError($q, err); + }) + .finally(() => { + hideLoader(); + }); +} + +async function saveEvaluation(body: any) { + console.log(body); + + // try { + // showLoader(); + // const res = await http.post(config.API.evaluationCheckspec(), body); + // return res; + // } catch (err) { + // messageError($q, err); + // } finally { + // hideLoader(); + // } +} + +export default { fetchCheckStatus, saveEvaluation }; diff --git a/src/modules/06_evaluate/views/EvaluateMain.vue b/src/modules/06_evaluate/views/EvaluateMain.vue index 70356e9..9dcbec3 100644 --- a/src/modules/06_evaluate/views/EvaluateMain.vue +++ b/src/modules/06_evaluate/views/EvaluateMain.vue @@ -9,10 +9,16 @@ import Tab1 from "@/modules/06_evaluate/components/Tab1.vue"; // ชำนาญ import Tab2 from "@/modules/06_evaluate/components/Tab2.vue"; // ชำนาญการพิเศษ import { useEvaluateStore } from "@/modules/06_evaluate/store"; +import { useCounterMixin } from "@/stores/mixin"; +const mixin = useCounterMixin(); const store = useEvaluateStore(); const router = useRouter(); const $q = useQuasar(); + +const { showLoader, hideLoader, messageError } = mixin; + +onMounted(async () => {});