fixed valiadtion another bugs

Neeraj Sharma
1 parent d58cc93a5f
Showing 3 changed files with 52 additions and 37 deletions Show diff stats
src/pages/Exam/exam.vue
src/pages/Exam/examSchedule.vue
src/pages/Exam/grade.vue
@@ -289,6 +289,7 @@
                           <v-text-field
                             slot="activator"
                             v-model="addExam.date"
+                            :rules="examDateRules"
                             label="Select Date"
                             append-icon="event"
                             readonly
@@ -376,6 +377,7 @@ export default {
     subjectCodeRules: [v => !!v || "Subject Code is required"],
     authorRules: [v => !!v || "Author is required"],
     noteRules: [v => !!v || "Note is required"],
+    examDateRules: [v => !!v || "Date is required"],
     headers: [
       {
         align: "justify-center",
@@ -436,7 +438,6 @@ export default {
         });
     },
     editItem(item) {
-      console.log("item", item);
       this.editedIndex = this.examData.indexOf(item);
       this.editedItem = Object.assign({}, item);
       this.editedItem.date =
@@ -490,8 +491,8 @@ export default {
       this.dialog1 = false;
     },
     submit() {
-      this.loading = true;
       if (this.$refs.form.validate()) {
+        this.loading = true;
         http()
           .post("/createExam", this.addExam)
           .then(response => {
@@ -503,10 +504,10 @@ export default {
             this.clear();
           })
           .catch(error => {
-            if ((this.snackbar = true)) {
-              this.text = error.response.data.message;
-              this.color = "red";
-            }
+            this.snackbar = true;
+            this.text = error.response.data.message;
+            this.color = "red";
+            this.loading = false;
           });
       }
     },
@@ -547,6 +547,7 @@
                           <v-text-field
                             slot="activator"
                             v-model="addSchedule.date"
+                            :rules="examScheduleDateRules"
                             label="Select Date"
                             append-icon="event"
                             readonly
@@ -704,6 +705,7 @@ export default {
     timeInRules: [v => !!v || "Time In is required"],
     timeOutRules: [v => !!v || "time Out s is required"],
     roomRules: [v => !!v || "Room is required"],
+    examScheduleDateRules: [v => !!v || "Date is required"],
     headers: [
       {
         align: "justify-center",
@@ -779,7 +781,8 @@ export default {
           headers: { Authorization: "Bearer " + this.token }
         })
         .then(response => {
-          this.ScheduleData = response.data.data;
+          // this.ScheduleData = response.data.data;
+          console.log("this.ScheduleData",this.ScheduleData)
           this.showLoader = false;
         })
         .catch(error => {
@@ -854,23 +857,23 @@ export default {
       this.dialog1 = false;
     },
     submit() {
-      this.loading = true;
       if (this.$refs.form.validate()) {
+        this.loading = true;
         http()
           .post("/createSchedule", this.addSchedule)
           .then(response => {
             this.snackbar = true;
-            this.text = "New  Exam Schedule added successfully";
-            this.getSchedulesList();
-            this.color = "succses";
+            this.text = "New Exam Schedule added successfully";
+            console.log("this.text",this.text)
+            this.color = "green";
             this.loading = false;
             this.clear();
           })
           .catch(error => {
-            if ((this.snackbar = true)) {
-              this.text = error.response.data.message;
-              this.color = "red";
-            }
+            this.snackbar = true;
+            this.text = error.response.data.message;
+            this.color = "red";
+            this.loading = false;
           });
       }
     },
@@ -38,7 +38,7 @@
               <v-spacer></v-spacer>
             </v-toolbar>
             <v-card-text style="height:470px;">
-              <v-form ref="form">
+              <v-form ref="formEditGrade" v-model="validEditGrade" lazy-validation>
                 <v-container fluid>
                   <v-layout>
                     <v-flex xs12 sm12>
@@ -51,6 +51,7 @@
                             placeholder="fill your Grade Name"
                             v-model="editedItem.gradeName"
                             type="text"
+                            :rules="editGradeName"
                           ></v-text-field>
                         </v-flex>
                       </v-layout>
@@ -64,6 +65,7 @@
                           <v-text-field
                             placeholder="fill your Grade Point"
                             v-model="editedItem.gradePoint"
+                            :rules="editGradePoint"
                             type="text"
                           ></v-text-field>
                         </v-flex>
@@ -78,6 +80,7 @@
                           <v-text-field
                             placeholder="fill your Mark From"
                             v-model="editedItem.marksFrom"
+                            :rules="editMarksFrom"
                             type="text"
                           ></v-text-field>
                         </v-flex>
@@ -92,6 +95,7 @@
                           <v-text-field
                             placeholder="fill your Mark From"
                             v-model="editedItem.marksUpTo"
+                            :rules="editMarksUpTo"
                             type="text"
                           ></v-text-field>
                         </v-flex>
@@ -404,6 +408,7 @@ export default {
     dialog: false,
     dialog1: false,
     valid: true,
+    validEditGrade: true,
     isActive: true,
     newActive: false,
     pagination: {
@@ -415,6 +420,11 @@ export default {
     markUptoRules: [v => !!v || "Mark Upto is required"],
     authorRules: [v => !!v || "Author is required"],
     noteRules: [v => !!v || "Note is required"],
+    editGradeName: [v => !!v || "Grade Name is required"],
+    editGradeName: [v => !!v || "Grade Name is required"],
+    editGradePoint: [v => !!v || "Grade Point required"],
+    editMarksFrom: [v => !!v || "Mark From is required"],
+    editMarksUpTo: [v => !!v || "Mark Upto is required"],
     headers: [
       {
         align: "justify-center",
@@ -546,23 +556,22 @@ export default {
       this.dialog1 = false;
     },
     submit() {
-      this.loading = true;
       if (this.$refs.form.validate()) {
+        this.loading = true;
         http()
           .post("/createGrade", this.addGrade)
           .then(response => {
             this.snackbar = true;
             this.text = "New Grade added successfully";
-            this.getGradeList();
             this.color = "succses";
             this.loading = false;
             this.clear();
+            this.getGradeList();
           })
           .catch(error => {
-            if ((this.snackbar = true)) {
-              this.text = error.response.data.message;
-              this.color = "red";
-            }
+            this.snackbar = true;
+            this.text = error.response.data.message;
+            this.color = "red";
           });
       }
     },
@@ -572,21 +581,23 @@ export default {
       this.loading = false;
     },
     save() {
-      this.editedItem.gradeId = this.editedItem._id;
-      http()
-        .put("/updateGrade", this.editedItem)
-        .then(response => {
-          this.snackbar = true;
-          this.text = "Successfully Edit Grade";
-          this.color = "green";
-          this.getGradeList();
-          this.close();
-        })
-        .catch(error => {
-          this.snackbar = true;
-          this.text = error.response.data.message;
-          this.color = "red";
-        });
+      if (this.$refs.formEditGrade.validate()) {
+        this.editedItem.gradeId = this.editedItem._id;
+        http()
+          .put("/updateGrade", this.editedItem)
+          .then(response => {
+            this.snackbar = true;
+            this.text = "Successfully Edit Grade";
+            this.color = "green";
+            this.getGradeList();
+            this.close();
+          })
+          .catch(error => {
+            this.snackbar = true;
+            this.text = error.response.data.message;
+            this.color = "red";
+          });
+      }
     }
   },
   mounted() {
...	...	@@ -289,6 +289,7 @@
289	289	<v-text-field
290	290	slot="activator"
291	291	v-model="addExam.date"
	292	+ :rules="examDateRules"
292	293	label="Select Date"
293	294	append-icon="event"
294	295	readonly
...	...	@@ -376,6 +377,7 @@ export default {
376	377	subjectCodeRules: [v => !!v \|\| "Subject Code is required"],
377	378	authorRules: [v => !!v \|\| "Author is required"],
378	379	noteRules: [v => !!v \|\| "Note is required"],
	380	+ examDateRules: [v => !!v \|\| "Date is required"],
379	381	headers: [
380	382	{
381	383	align: "justify-center",
...	...	@@ -436,7 +438,6 @@ export default {
436	438	});
437	439	},
438	440	editItem(item) {
439		- console.log("item", item);
440	441	this.editedIndex = this.examData.indexOf(item);
441	442	this.editedItem = Object.assign({}, item);
442	443	this.editedItem.date =
...	...	@@ -490,8 +491,8 @@ export default {
490	491	this.dialog1 = false;
491	492	},
492	493	submit() {
493		- this.loading = true;
494	494	if (this.$refs.form.validate()) {
	495	+ this.loading = true;
495	496	http()
496	497	.post("/createExam", this.addExam)
497	498	.then(response => {
...	...	@@ -503,10 +504,10 @@ export default {
503	504	this.clear();
504	505	})
505	506	.catch(error => {
506		- if ((this.snackbar = true)) {
507		- this.text = error.response.data.message;
508		- this.color = "red";
509		- }
	507	+ this.snackbar = true;
	508	+ this.text = error.response.data.message;
	509	+ this.color = "red";
	510	+ this.loading = false;
510	511	});
511	512	}
512	513	},
...	...
...	...	@@ -547,6 +547,7 @@
547	547	<v-text-field
548	548	slot="activator"
549	549	v-model="addSchedule.date"
	550	+ :rules="examScheduleDateRules"
550	551	label="Select Date"
551	552	append-icon="event"
552	553	readonly
...	...	@@ -704,6 +705,7 @@ export default {
704	705	timeInRules: [v => !!v \|\| "Time In is required"],
705	706	timeOutRules: [v => !!v \|\| "time Out s is required"],
706	707	roomRules: [v => !!v \|\| "Room is required"],
	708	+ examScheduleDateRules: [v => !!v \|\| "Date is required"],
707	709	headers: [
708	710	{
709	711	align: "justify-center",
...	...	@@ -779,7 +781,8 @@ export default {
779	781	headers: { Authorization: "Bearer " + this.token }
780	782	})
781	783	.then(response => {
782		- this.ScheduleData = response.data.data;
	784	+ // this.ScheduleData = response.data.data;
	785	+ console.log("this.ScheduleData",this.ScheduleData)
783	786	this.showLoader = false;
784	787	})
785	788	.catch(error => {
...	...	@@ -854,23 +857,23 @@ export default {
854	857	this.dialog1 = false;
855	858	},
856	859	submit() {
857		- this.loading = true;
858	860	if (this.$refs.form.validate()) {
	861	+ this.loading = true;
859	862	http()
860	863	.post("/createSchedule", this.addSchedule)
861	864	.then(response => {
862	865	this.snackbar = true;
863		- this.text = "New Exam Schedule added successfully";
864		- this.getSchedulesList();
865		- this.color = "succses";
	866	+ this.text = "New Exam Schedule added successfully";
	867	+ console.log("this.text",this.text)
	868	+ this.color = "green";
866	869	this.loading = false;
867	870	this.clear();
868	871	})
869	872	.catch(error => {
870		- if ((this.snackbar = true)) {
871		- this.text = error.response.data.message;
872		- this.color = "red";
873		- }
	873	+ this.snackbar = true;
	874	+ this.text = error.response.data.message;
	875	+ this.color = "red";
	876	+ this.loading = false;
874	877	});
875	878	}
876	879	},
...	...
...	...	@@ -38,7 +38,7 @@
38	38	<v-spacer></v-spacer>
39	39	</v-toolbar>
40	40	<v-card-text style="height:470px;">
41		- <v-form ref="form">
	41	+ <v-form ref="formEditGrade" v-model="validEditGrade" lazy-validation>
42	42	<v-container fluid>
43	43	<v-layout>
44	44	<v-flex xs12 sm12>
...	...	@@ -51,6 +51,7 @@
51	51	placeholder="fill your Grade Name"
52	52	v-model="editedItem.gradeName"
53	53	type="text"
	54	+ :rules="editGradeName"
54	55	></v-text-field>
55	56	</v-flex>
56	57	</v-layout>
...	...	@@ -64,6 +65,7 @@
64	65	<v-text-field
65	66	placeholder="fill your Grade Point"
66	67	v-model="editedItem.gradePoint"
	68	+ :rules="editGradePoint"
67	69	type="text"
68	70	></v-text-field>
69	71	</v-flex>
...	...	@@ -78,6 +80,7 @@
78	80	<v-text-field
79	81	placeholder="fill your Mark From"
80	82	v-model="editedItem.marksFrom"
	83	+ :rules="editMarksFrom"
81	84	type="text"
82	85	></v-text-field>
83	86	</v-flex>
...	...	@@ -92,6 +95,7 @@
92	95	<v-text-field
93	96	placeholder="fill your Mark From"
94	97	v-model="editedItem.marksUpTo"
	98	+ :rules="editMarksUpTo"
95	99	type="text"
96	100	></v-text-field>
97	101	</v-flex>
...	...	@@ -404,6 +408,7 @@ export default {
404	408	dialog: false,
405	409	dialog1: false,
406	410	valid: true,
	411	+ validEditGrade: true,
407	412	isActive: true,
408	413	newActive: false,
409	414	pagination: {
...	...	@@ -415,6 +420,11 @@ export default {
415	420	markUptoRules: [v => !!v \|\| "Mark Upto is required"],
416	421	authorRules: [v => !!v \|\| "Author is required"],
417	422	noteRules: [v => !!v \|\| "Note is required"],
	423	+ editGradeName: [v => !!v \|\| "Grade Name is required"],
	424	+ editGradeName: [v => !!v \|\| "Grade Name is required"],
	425	+ editGradePoint: [v => !!v \|\| "Grade Point required"],
	426	+ editMarksFrom: [v => !!v \|\| "Mark From is required"],
	427	+ editMarksUpTo: [v => !!v \|\| "Mark Upto is required"],
418	428	headers: [
419	429	{
420	430	align: "justify-center",
...	...	@@ -546,23 +556,22 @@ export default {
546	556	this.dialog1 = false;
547	557	},
548	558	submit() {
549		- this.loading = true;
550	559	if (this.$refs.form.validate()) {
	560	+ this.loading = true;
551	561	http()
552	562	.post("/createGrade", this.addGrade)
553	563	.then(response => {
554	564	this.snackbar = true;
555	565	this.text = "New Grade added successfully";
556		- this.getGradeList();
557	566	this.color = "succses";
558	567	this.loading = false;
559	568	this.clear();
	569	+ this.getGradeList();
560	570	})
561	571	.catch(error => {
562		- if ((this.snackbar = true)) {
563		- this.text = error.response.data.message;
564		- this.color = "red";
565		- }
	572	+ this.snackbar = true;
	573	+ this.text = error.response.data.message;
	574	+ this.color = "red";
566	575	});
567	576	}
568	577	},
...	...	@@ -572,21 +581,23 @@ export default {
572	581	this.loading = false;
573	582	},
574	583	save() {
575		- this.editedItem.gradeId = this.editedItem._id;
576		- http()
577		- .put("/updateGrade", this.editedItem)
578		- .then(response => {
579		- this.snackbar = true;
580		- this.text = "Successfully Edit Grade";
581		- this.color = "green";
582		- this.getGradeList();
583		- this.close();
584		- })
585		- .catch(error => {
586		- this.snackbar = true;
587		- this.text = error.response.data.message;
588		- this.color = "red";
589		- });
	584	+ if (this.$refs.formEditGrade.validate()) {
	585	+ this.editedItem.gradeId = this.editedItem._id;
	586	+ http()
	587	+ .put("/updateGrade", this.editedItem)
	588	+ .then(response => {
	589	+ this.snackbar = true;
	590	+ this.text = "Successfully Edit Grade";
	591	+ this.color = "green";
	592	+ this.getGradeList();
	593	+ this.close();
	594	+ })
	595	+ .catch(error => {
	596	+ this.snackbar = true;
	597	+ this.text = error.response.data.message;
	598	+ this.color = "red";
	599	+ });
	600	+ }
590	601	}
591	602	},
592	603	mounted() {
...	...