Skip to content

Commit

Permalink
Merge pull request #280 from icefoganalytics/test
Browse files Browse the repository at this point in the history
Vendor bug fix and standing docs stub
  • Loading branch information
datajohnson authored Jul 9, 2024
2 parents ac036e2 + 90c9d5e commit 1c490f3
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 21 deletions.
30 changes: 30 additions & 0 deletions src/web/src/components/student/StandingDocuments.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<template>
<div>
<v-card class="default mb-5">
<v-card-title class="text-h6 font-weight-regular d-flex">
Standing Documents
</v-card-title>
<v-card-text></v-card-text>
</v-card>

<confirm-dialog ref="confirm"></confirm-dialog>
</div>
</template>
<script>
import store from "../../store";
export default {
data: () => ({
showAdd: false,
}),
computed: {
student: function() {
return store.getters.selectedStudent;
},
},
async created() {
store.dispatch("setAcademicYears");
},
methods: {},
};
</script>
33 changes: 13 additions & 20 deletions src/web/src/components/student/StudentDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,24 @@
<v-tab key="1">SFA Info</v-tab>
<v-tab key="2">Vendor info</v-tab>
<v-tab key="3">Consent</v-tab>
<v-tab key="4">Standing Documents</v-tab>
</v-tabs>

<v-tabs-items v-model="tab" style="padding: 20px 0">
<v-tab-item key="0">
<contact-form
v-on:showSuccess="showSuccess"
v-on:showError="showError"
></contact-form>
<contact-form v-on:showSuccess="showSuccess" v-on:showError="showError"></contact-form>
</v-tab-item>
<v-tab-item key="1">
<sfa-info-form
v-on:showSuccess="showSuccess"
v-on:showError="showError"
></sfa-info-form>
<sfa-info-form v-on:showSuccess="showSuccess" v-on:showError="showError"></sfa-info-form>
</v-tab-item>
<v-tab-item key="2">
<vendor-info-form
v-on:showSuccess="showSuccess"
v-on:showError="showError"
></vendor-info-form>
<vendor-info-form v-on:showSuccess="showSuccess" v-on:showError="showError"></vendor-info-form>
</v-tab-item>
<v-tab-item key="3">
<consent-form
v-on:showSuccess="showSuccess"
v-on:showError="showError"
></consent-form>
<consent-form v-on:showSuccess="showSuccess" v-on:showError="showError"></consent-form>
</v-tab-item>
<v-tab-item key="4">
<standing-documents v-on:showSuccess="showSuccess" v-on:showError="showError"></standing-documents>
</v-tab-item>
</v-tabs-items>
</div>
Expand All @@ -44,12 +36,13 @@ import store from "../../store";
import ConsentForm from "./ConsentForm.vue";
import ContactForm from "./ContactForm.vue";
import SfaInfoForm from './SfaInfoForm.vue';
import VendorInfoForm from './VendorInfoForm.vue';
import SfaInfoForm from "./SfaInfoForm.vue";
import VendorInfoForm from "./VendorInfoForm.vue";
import StandingDocuments from "./StandingDocuments.vue";
export default {
name: "Home",
components: { ContactForm, ConsentForm, SfaInfoForm, VendorInfoForm },
components: { ContactForm, ConsentForm, SfaInfoForm, VendorInfoForm, StandingDocuments },
computed: {
...mapState(["selectedStudent"]),
},
Expand Down Expand Up @@ -77,7 +70,7 @@ export default {
}
},
watch: {
student: function (val) {
student: function(val) {
if (val) this.updateView(val);
},
//selectedStudent: function (val) {
Expand Down
7 changes: 6 additions & 1 deletion src/web/src/components/student/VendorInfoForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<v-icon @click="showEdit = false">mdi-close</v-icon>
</v-toolbar>
<v-card>
<v-card-text class="pt-4">
<v-card-text class="pt-4" v-if="editRecord">
<p>Once this request has been completed and the verified, please click the 'Mark Complete'</p>

<p>
Expand Down Expand Up @@ -265,6 +265,11 @@ export default {
store.dispatch("updateStudent", [field, value, type, extraId, this, addressType]);
},
async getVendorData() {
if (!this.student || isNil(this.student.vendor_id)) {
console.log("Not looking up vendor");
return;
}
this.isLoadingVendor = true;
await axios
Expand Down

0 comments on commit 1c490f3

Please sign in to comment.