viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 728b5d417ab010325fb8c94d66148ce14309bb8a

Authored by Neeraj Sharma
1 parent ff9003e131
Exists in master and in 3 other branches amber-development, development, ui-design

solve bugs in add invoice

Showing 2 changed files with 18 additions and 13 deletions   Show diff stats
src/pages/Account/invoice.vue
Diff comments   View file @728b5d4
... ... @@ -359,6 +359,7 @@
359 359 <v-select
360 360 :items="paymentMethods"
361 361 v-model="invoiceData.paymentMethod"
  362 + :rules="paymentMethodRules"
362 363 label="Select Payment Method"
363 364 required
364 365 ></v-select>
... ... @@ -589,6 +590,7 @@ export default {
589 590 subtotalRules: [v => !!v || "Subtotal is required"],
590 591 paymentRules: [v => !!v || "Payment is required"],
591 592 paidAmountRules: [v => !!v || "Paid Amount is required"],
  593 + paymentMethodRules: [],
592 594 headers: [
593 595 {
594 596 text: "No",
... ... @@ -1017,13 +1019,17 @@ export default {
1017 1019 getPayMethodList() {
1018 1020 if (this.invoiceData.paymentStatus == "PARTIALLY_PAID") {
1019 1021 this.showPayMethods = true;
  1022 + this.paymentMethodRules = [v => !!v || "Payment Method is required"];
1020 1023 } else if (this.invoiceData.paymentStatus == "FULLY_PAID") {
1021 1024 this.showPayMethods = true;
  1025 + this.paymentMethodRules = [v => !!v || "Payment Method is required"];
1022 1026 } else if (this.invoiceData.paymentStatus == "NOT_PAID") {
1023 1027 for (let i = 0; i < this.feeTypeData.length; i++) {
1024 1028 this.feeTypeData[i].paidAmount = "0.00";
1025 1029 this.feeType.paidAmount = "0.00";
1026 1030 }
  1031 + this.paymentMethodRules = "";
  1032 + this.showPayMethods = false;
1027 1033 } else {
1028 1034 this.showPayMethods = false;
1029 1035 }
... ...
src/pages/Report/progressCardReport.vue
Diff comments   View file @728b5d4
... ... @@ -177,7 +177,6 @@
177 177 </div>
178 178 </v-flex>
179 179 </v-layout>
180   - <!-- {{studentMark.examId.examName}} -->
181 180 <!-- Start Table Report Marks -->
182 181 <v-card class="student-table">
183 182 <table
... ... @@ -250,36 +249,36 @@
250 249 </tbody>
251 250 <tfoot>
252 251 <tr style="border: 1px solid lightgrey !important;">
253   - <td colspan="5">
254   - <span class="subheding">Total Marks</span>
255   - </td>
  252 + <td
  253 + colspan="5"
  254 + style="text-align:center"
  255 + class="subheding"
  256 + >Total Marks</td>
256 257 <td
257 258 colspan="7"
258 259 style="border: 1px solid lightgrey !important;padding: 10px;"
259 260 >{{ studentMark.totalMarks }}</td>
260 261 </tr>
261 262 <tr>
262   - <td colspan="5">
263   - <span class="subheding">Grade</span>
264   - </td>
  263 + <td colspan="5" style="text-align:center" class="subheding">Grade</td>
265 264 <td
266 265 colspan="7"
267 266 style="border: 1px solid lightgrey !important;padding: 10px;"
268 267 >{{ studentMark.grade }}</td>
269 268 </tr>
270 269 <tr>
271   - <td colspan="5">
272   - <span class="subheding">Average Mark</span>
273   - </td>
  270 + <td
  271 + colspan="5"
  272 + style="text-align:center"
  273 + class="subheding"
  274 + >Average Mark</td>
274 275 <td
275 276 colspan="7"
276 277 style="border: 1px solid lightgrey !important;padding: 10px;"
277 278 ></td>
278 279 </tr>
279 280 <tr>
280   - <td colspan="5">
281   - <span class="subheding">GPA</span>
282   - </td>
  281 + <td colspan="5" style="text-align:center" class="subheding">GPA</td>
283 282 <td
284 283 colspan="7"
285 284 style="border: 1px solid lightgrey !important;padding: 10px;"
... ...