diff --git a/src/Services/http.js b/src/Services/http.js index 543a37c..f91a130 100644 --- a/src/Services/http.js +++ b/src/Services/http.js @@ -7,7 +7,7 @@ const baseURL = `${baseDomain}`; export default () => { return axios.create({ - // baseURL: 'http://192.168.0.108:3002/v1', + // baseURL: 'http://192.168.0.120:3002/v1', baseURL, headers: { Authorization: `Bearer ${store.state.token}` diff --git a/src/pages/Account/editInvoice.vue b/src/pages/Account/editInvoice.vue index 6aeecd7..53f21ac 100644 --- a/src/pages/Account/editInvoice.vue +++ b/src/pages/Account/editInvoice.vue @@ -492,6 +492,12 @@ export default { feeType.paidAmount = Number(feeType.paidAmount) + Number(this.feeTypeData[i].paidAmount); this.feeType.paidAmount = feeType.paidAmount.toFixed(2); + + // if paid Amount fill large of subtotal value so this condition are fixed filled subtotal value. + if (feeType.paidAmount > feeType.subTotal) { + this.feeTypeData[i].paidAmount = this.feeTypeData[i].subTotal; + this.feeType.paidAmount = feeType.subTotal; + } } }, getPayMethodList() { diff --git a/src/pages/Account/feeTypes.vue b/src/pages/Account/feeTypes.vue index 6e9177f..828adf5 100644 --- a/src/pages/Account/feeTypes.vue +++ b/src/pages/Account/feeTypes.vue @@ -47,7 +47,6 @@ @@ -61,7 +60,6 @@ name="input-7-1" v-model="editedItem.note" placeholder="fill your Note" - :rules="noteRules" multi-line required > @@ -230,7 +228,6 @@ v-model="feeTypeData.note" placeholder="fill your Note" type="text" - :rules="noteRules" multi-line required > diff --git a/src/pages/Account/invoice.vue b/src/pages/Account/invoice.vue index 64cb7a9..41c77b2 100644 --- a/src/pages/Account/invoice.vue +++ b/src/pages/Account/invoice.vue @@ -116,11 +116,16 @@ class="red lighten-1 pa-2 white--text paymentStatus" >{{ props.item.paymentStatus }} - + {{ props.item.paymentStatus }} + + {{ props.item.paymentStatus }} + {{ dates(props.item.date) }} @@ -176,7 +181,7 @@ :right="x === 'right'" :vertical="mode === 'vertical'" v-model="snackbar" - color="success" + :color="color" >{{ text }} @@ -423,8 +428,9 @@ export default { y: "top", x: "right", mode: "", - timeout: 3000, + timeout: 5000, text: "", + color: "", showLoader: false, loading: false, date: null, @@ -546,9 +552,9 @@ export default { } ) .then(response => { - if ((this.snackbar = true)) { - this.text = "Successfully delete Existing Invoice"; - } + this.snackbar = true; + this.text = "Successfully delete Existing Invoice"; + this.color = "green"; this.getInvoiceList(); }) .catch(error => { @@ -578,6 +584,23 @@ export default { close1() { this.dialog1 = false; }, + // totalAmount() { + // // console.log("this.feeType.paidAmount ", this.feeType.paidAmount); + // // console.log( + // // "this.feeType.subTotalAAAAAAAAAAAAAAA ", + // // this.feeType.subTotal + // // ); + + // if (this.feeType.paidAmount < this.feeType.subTotal) { + // console.log("this.feeType.subTotalBBBBBBBBBBB ", this.feeType.subTotal); + + // this.feeType.paidAmount = this.feeType.subTotal; + // console.log( + // "this.feeType.paidAmount BBBBBBBBBBB", + // this.feeType.paidAmount + // ); + // } + // }, submit() { let feeTypeId = ""; for (let i = 0; i < this.feeTypes.length; i++) { @@ -607,6 +630,7 @@ export default { this.getInvoiceList(); this.snackbar = true; this.text = "New Invoice added successfully"; + this.color = "green"; this.clear(); this.feeTypeData = []; if (this.feeTypeData.length == 0) { @@ -621,9 +645,10 @@ export default { this.loading = false; }) .catch(error => { - // console.log(error); + console.log(error.response.data.errors[0].messages[0]); this.snackbar = true; - this.text = error.response.data.message; + this.text = error.response.data.errors[0].messages[0]; + this.color = "error"; this.loading = false; }); } @@ -686,6 +711,7 @@ export default { }); }, getAllStudents() { + this.showLoader = true; http() .get("/getStudentsList", { params: { @@ -696,8 +722,10 @@ export default { }) .then(response => { this.studentList = response.data.data; + this.showLoader = false; }) .catch(err => { + this.showLoader = false; // console.log("err====>", err); // this.$router.replace({ path: "/" }); }); @@ -746,7 +774,6 @@ export default { feeType.subParticularTotal = this.feeTypeData[i].amount - (this.feeTypeData[i].amount * this.feeTypeData[i].discount) / 100; - // console.log("feeType.subTotal", feeType.subTotal); this.feeTypeData[i].subTotal = feeType.subParticularTotal.toFixed(2); } @@ -761,6 +788,12 @@ export default { feeType.paidAmount = Number(feeType.paidAmount) + Number(this.feeTypeData[i].paidAmount); this.feeType.paidAmount = feeType.paidAmount.toFixed(2); + + // if paid Amount fill large of subtotal value so this condition are fixed filled subtotal value. + if (feeType.paidAmount > feeType.subTotal) { + this.feeTypeData[i].paidAmount = this.feeTypeData[i].subTotal; + this.feeType.paidAmount = feeType.subTotal; + } } }, getPayMethodList() { diff --git a/src/pages/Account/viewInvoice.vue b/src/pages/Account/viewInvoice.vue index 5a541ed..c1d5247 100644 --- a/src/pages/Account/viewInvoice.vue +++ b/src/pages/Account/viewInvoice.vue @@ -166,10 +166,8 @@ export default { (this.feeType.amount = response.data.data.totalAmount), (this.feeType.discount = response.data.data.totalDiscount), (this.feeType.subTotal = response.data.data.totalSubTotal), - (this.feeType.totalPaidAmount = response.data.data.totalPaidAmount( - // console.log("response.data.data.totalPaidAmount",response.data.data.totalPaidAmount) - (this.showLoader = false) - )); + (this.feeType.totalPaidAmount = response.data.data.totalPaidAmount); + this.showLoader = false; }) .catch(error => { this.showLoader = false; diff --git a/src/pages/Class/addclass.vue b/src/pages/Class/addclass.vue index a92fe1d..a58dbfa 100644 --- a/src/pages/Class/addclass.vue +++ b/src/pages/Class/addclass.vue @@ -45,12 +45,11 @@ - + > @@ -109,7 +108,7 @@ @@ -182,14 +181,13 @@ - + > @@ -253,8 +251,7 @@ export default { { text: "Action", value: "", sortable: false, align: "center" } ], - desserts: [], - classList: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"], + classList: [], editedIndex: -1, editedItem: { classNum: "" @@ -270,7 +267,7 @@ export default { http() .get("/getClassesList") .then(response => { - this.desserts = response.data.data; + this.classList = response.data.data; this.showLoader = false; }) .catch(error => { @@ -283,12 +280,12 @@ export default { }); }, editItem(item) { - this.editedIndex = this.desserts.indexOf(item); + this.editedIndex = this.classList.indexOf(item); this.editedItem = Object.assign({}, item); this.dialog = true; }, profile(item) { - this.editedIndex = this.desserts.indexOf(item); + this.editedIndex = this.classList.indexOf(item); this.editedItem = Object.assign({}, item); this.dialog1 = true; }, diff --git a/src/pages/School/school.vue b/src/pages/School/school.vue index e643398..b50845c 100644 --- a/src/pages/School/school.vue +++ b/src/pages/School/school.vue @@ -470,7 +470,6 @@ @@ -569,7 +568,7 @@ @@ -770,7 +767,6 @@ export default { country: [v => !!v || " Country Name is required"], permanentAddress: [v => !!v || " Permanent Address is requiclearred"], presentAddress: [v => !!v || " Present Address is required"], - landlineNoRule: [v => !!v || " Present Address is required"], mobileNoRules: [v => !!v || "Mobile Number is required"], stateRules: [v => !!v || "State Name is required"], schoolDetailRule: [v => !!v || "school Detail is required"], diff --git a/src/pages/Section/section.vue b/src/pages/Section/section.vue index 9ab125f..8aa2aab 100644 --- a/src/pages/Section/section.vue +++ b/src/pages/Section/section.vue @@ -392,15 +392,15 @@ export default { classData: { classNum: "" }, - classId: "", - classInchargeId: "", + // classId: "", + // classInchargeId: "", teacherData: [ { name: "" } - ], - name: "", - session: new Date().getFullYear() + ] + // name: "", + // session: new Date().getFullYear() }, sectionData: { session: new Date().getFullYear() @@ -431,7 +431,6 @@ export default { editItem(item) { this.editedIndex = this.desserts.indexOf(item); this.editedItem = Object.assign({}, item); - console.log(this.editedItem); this.dialog = true; }, profile(item) { @@ -451,9 +450,8 @@ export default { } ) .then(response => { - if ((this.snackbar = true)) { - this.text = "Successfully delete Existing Section"; - } + this.snackbar = true; + this.text = "Successfully delete Existing Section"; this.getSectionList(); }) .catch(error => { @@ -492,26 +490,22 @@ export default { name: this.sectionData.name, classId: this.sectionData.classNum, session: this.sectionData.session, - classInchargeId: this.sectionData._id + classInchargeId: this.sectionData.sectionId }; this.loading = true; http() .post("/createSection", addSection) .then(response => { - console.log(response); this.getSectionList(); - if ((this.snackbar = true)) { - this.text = "New Section added successfully"; - } - + this.snackbar = true; + this.text = "New Section added successfully"; this.clear(); this.loading = false; }) .catch(error => { // console.log(error); - if ((this.snackbar = true)) { - this.text = error.response.data.message; - } + this.snackbar = true; + this.text = error.response.data.message; this.loading = false; }); } @@ -524,16 +518,13 @@ export default { http() .put("/updateSection", this.editedItem) .then(response => { - // console.log("editStudent",editStudent); - if ((this.snackbar = true)) { - this.text = "Successfully Edit Existing Section"; - } + this.snackbar = true; + this.text = "Successfully Edit Existing Section"; this.getSectionList(); this.close(); }) .catch(error => { this.text = error.response.data.message; - // console.log(error); }); }, getAllTeacher() { diff --git a/src/pages/Students/students.vue b/src/pages/Students/students.vue index b17f604..a96c167 100644 --- a/src/pages/Students/students.vue +++ b/src/pages/Students/students.vue @@ -572,7 +572,7 @@ --> - + @@ -1730,15 +1730,14 @@ - + @@ -1749,12 +1748,26 @@ + + + + + + + + + + + + @@ -1764,7 +1777,7 @@ - + @@ -1786,7 +1799,7 @@ sm12 class="pt-4 pr-4 subheading text-xs-center addressForm" > - + @@ -2168,6 +2181,9 @@ export default { close1() { this.dialog1 = false; }, + copyData() { + this.addStudents.permanentAddress = this.addStudents.presentAddress; + }, submit() { if (this.$refs.form.validate()) { let addStudent = { @@ -2297,6 +2313,7 @@ export default { }, getParentDetails() { if (this.parentData.fatherCellNo.length > 9) { + this.showLoader = true; http() .get("getParticularParent", { params: { fatherCellNo: this.parentData.fatherCellNo }, @@ -2309,9 +2326,13 @@ export default { this.showParent = false; this.parentData = response.data.data; this.parentId = response.data.data._id; + this.showLoader = false; }) .catch(error => { console.log("err====>", error.response.data.message); + this.text = error.response.data.message; + this.snackbar = true; + this.showLoader = false; }); } } diff --git a/src/pages/Teachers/teachers.vue b/src/pages/Teachers/teachers.vue index 5b3e72d..42edeff 100644 --- a/src/pages/Teachers/teachers.vue +++ b/src/pages/Teachers/teachers.vue @@ -825,7 +825,7 @@ v-model="addTeachers.presentAddress" :rules="presentAddress" placeholder="fill Your present Address" - required + @keyup="copyData" > @@ -836,6 +836,22 @@ + + + + + + + + + + + + - + @@ -8,70 +8,107 @@ General Setting - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -120,7 +157,11 @@ export default { setting: {}, valid: true, loading: false, - text: "" + text: "", + imageData: {}, + imageName: "", + imageUrl: "", + imageFile: "" }; }, mounted() { @@ -128,9 +169,39 @@ export default { // this.getRole(); }, methods: { + pickFile() { + this.$refs.image.click(); + }, + onFilePicked(e) { + // console.log(e) + const files = e.target.files; + this.imageData.upload = e.target.files[0]; + if (files[0] !== undefined) { + this.imageName = files[0].name; + if (this.imageName.lastIndexOf(".") <= 0) { + return; + } + const fr = new FileReader(); + fr.readAsDataURL(files[0]); + fr.addEventListener("load", () => { + this.imageUrl = fr.result; + this.imageFile = files[0]; // this is an image file that can be sent to server... + this.imageData.imageUrl = URL.createObjectURL(this.imageFile); + }); + } else { + this.imageName = ""; + this.imageFile = ""; + this.imageUrl = ""; + } + }, reset() { if (this.$refs.form.validate()) { this.loading = true; + if (this.imageUrl) { + var str = this.imageUrl; + const [baseUrl, imageUrl] = str.split(/,/); + this.setting.upload = imageUrl; + } this.setting.schoolId = this.$store.state.id; http() .put("/updateSchool", this.setting, { @@ -141,6 +212,7 @@ export default { this.snackbar = true; this.text = response.data.message; this.color = "green"; + this.imageUrl = ""; this.clear(); }) .catch(error => { @@ -206,11 +278,6 @@ export default { };