viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 7014df603e9e53bfcf01d624be2f5b7603068636

Authored by Shikha Mishra
1 parent dc7f013460
Exists in master and in 2 other branches amber-development, ui-design

Improve placeholder name while changing passowrd, Clear preavious data while sel… 

…ecting class from drop-down in student attendence, exam schedule, marks, students, routine, time table,global payment, progress card report and id card report and Student data was not showing at some times issue solved
Showing 11 changed files with 51 additions and 27 deletions   Show diff stats
src/pages/Academic/routine.vue
Diff comments   View file @7014df6
... ... @@ -853,6 +853,7 @@ export default {
853 853 getSections(_id) {
854 854 var token = this.$store.state.token;
855 855 this.showLoader = true;
  856 + this.routineList = [];
856 857 http()
857 858 .get(
858 859 "/getSectionsList",
... ...
src/pages/Account/globalPayment.vue
Diff comments   View file @7014df6
... ... @@ -54,7 +54,6 @@
54 54 v-model="selectStudents.selectId"
55 55 item-text="name"
56 56 item-value="_id"
57   - :rules="studentRules"
58 57 required
59 58 ></v-select>
60 59 </v-flex>
... ... @@ -333,6 +332,7 @@ export default {
333 332 getSection() {
334 333 var token = this.$store.state.token;
335 334 this.showLoader = true;
  335 + this.studentInvoiceData = [];
336 336 http()
337 337 .get(
338 338 "/getSectionsList",
... ...
src/pages/Administrator/resetPassword.vue
Diff comments   View file @7014df6
... ... @@ -28,7 +28,7 @@
28 28 item-text="email"
29 29 item-value="email"
30 30 v-model="resetPassword.email"
31   - ></v-select> -->
  31 + ></v-select>-->
32 32 <v-text-field
33 33 :append-icon="e1 ? 'visibility_off' : 'visibility'"
34 34 :append-icon-cb="() => (e1 = !e1)"
... ... @@ -61,7 +61,7 @@
61 61 v-validate="{ required: false, is: resetPassword.newPassword }"
62 62 data-vv-name="password2"
63 63 data-vv-as="password"
64   - label="Renter New Password"
  64 + label="Re-enter New Password"
65 65 ></v-text-field>
66 66 </v-form>
67 67 </v-flex>
... ... @@ -115,16 +115,16 @@ export default {
115 115 text: "Password Changed",
116 116 newPassword: "",
117 117 oldPassword: "",
118   - userRule: [v => !!v || "User is required"],
119   - userNameRule: [v => !!v || "User Name is required"],
120   - oldPasswordRule: [v => !!v || "Old Password is required"],
121   - newPasswordRule: [v => !!v || "New Password is required"],
122   - rePasswordRule: [v => !!v || "Re-Password is required"]
  118 + userRule: [(v) => !!v || "User is required"],
  119 + userNameRule: [(v) => !!v || "User Name is required"],
  120 + oldPasswordRule: [(v) => !!v || "Old Password is required"],
  121 + newPasswordRule: [(v) => !!v || "New Password is required"],
  122 + rePasswordRule: [(v) => !!v || "Re-Password is required"],
123 123 };
124 124 },
125 125 mounted() {
126 126 this.token = this.$store.state.token;
127   - if (this.$store.state.role != "PARENT"){
  127 + if (this.$store.state.role != "PARENT") {
128 128 this.getRole();
129 129 }
130 130 },
... ... @@ -138,16 +138,16 @@ export default {
138 138 this.resetPassword.newPassword = this.resetPassword.newPassword;
139 139 http()
140 140 .put("/change-password", this.resetPassword, {
141   - headers: { Authorization: "Bearer " + this.token }
  141 + headers: { Authorization: "Bearer " + this.token },
142 142 })
143   - .then(response => {
  143 + .then((response) => {
144 144 this.loading = false;
145 145 this.snackbar = true;
146 146 this.text = "Successfully Restet password !!";
147 147 this.color = "green";
148 148 this.clear();
149 149 })
150   - .catch(error => {
  150 + .catch((error) => {
151 151 // console.log("err====>",err);
152 152 this.snackbar = true;
153 153 this.text = "User Not Found or Incorrect currentPassword";
... ... @@ -160,9 +160,9 @@ export default {
160 160 this.showLoader = true;
161 161 http()
162 162 .get("/getRolesList", {
163   - headers: { Authorization: "Bearer " + this.token }
  163 + headers: { Authorization: "Bearer " + this.token },
164 164 })
165   - .then(response => {
  165 + .then((response) => {
166 166 for (let i = 0; i < response.data.data.length; i++) {
167 167 if (
168 168 response.data.data[i].name != "SUPERADMIN" &&
... ... @@ -173,7 +173,7 @@ export default {
173 173 }
174 174 }
175 175 })
176   - .catch(error => {
  176 + .catch((error) => {
177 177 this.showLoader = false;
178 178 if (error.response.status === 401) {
179 179 this.$router.replace({ path: "/" });
... ... @@ -190,14 +190,14 @@ export default {
190 190 http()
191 191 .get("/getUserWithRole", {
192 192 params: {
193   - name: roles
  193 + name: roles,
194 194 },
195   - headers: { Authorization: "Bearer " + this.token }
  195 + headers: { Authorization: "Bearer " + this.token },
196 196 })
197   - .then(response => {
  197 + .then((response) => {
198 198 this.getUsersName = response.data.data;
199 199 })
200   - .catch(error => {
  200 + .catch((error) => {
201 201 this.showLoader = false;
202 202 if (error.response.status === 401) {
203 203 this.$router.replace({ path: "/" });
... ... @@ -205,8 +205,8 @@ export default {
205 205 this.$store.dispatch("Id", null);
206 206 }
207 207 });
208   - }
209   - }
  208 + },
  209 + },
210 210 };
211 211 </script>
212 212 <style scoped>
... ...
src/pages/Attendence/studentAttendence.vue
Diff comments   View file @7014df6
... ... @@ -394,6 +394,7 @@ export default {
394 394 },
395 395 getSection(_id) {
396 396 this.showLoader = true;
  397 + this.studentsData = [];
397 398 http()
398 399 .get(
399 400 "/getSectionsList",
... ...
src/pages/Dashboard/LiveOnlineClass.vue
Diff comments   View file @7014df6
... ... @@ -151,6 +151,7 @@ export default {
151 151  
152 152 // JITSI CONTAINER
153 153 liveLink: "",
  154 + livePassword: "",
154 155 token: "",
155 156 selectStudents: {},
156 157 classRules: [(v) => !!v || " Class Name is required"],
... ... @@ -237,7 +238,7 @@ export default {
237 238 // console.log("Local User Joined");
238 239 this.showLoader = false;
239 240 _this.api.executeCommand("displayName", _this.username);
240   - _this.api.executeCommand("password", _this.roomPassword);
  241 + _this.api.executeCommand("password", _this.roomPassword);
241 242 });
242 243  
243 244 _this.api.on("readyToClose", () => {
... ... @@ -309,6 +310,7 @@ export default {
309 310 },
310 311 async studentClasses() {
311 312 this.liveLink = "";
  313 + this.livePassword = "";
312 314 this.room = "";
313 315 this.username = "";
314 316 this.roomPassword = "";
... ... @@ -334,11 +336,14 @@ export default {
334 336 this.studentBtn = "";
335 337 } else {
336 338 this.liveLink = response.data.data[0].link;
  339 + this.livePassword = response.data.data[0].password;
337 340 var room = response.data.data[0].roomName;
338 341 var username = this.currentUser;
339 342 var roomPassword = response.data.data[0].password;
340 343 var this_ = this;
341 344 // console.log(this.room, this.roomPassword, this.username);
  345 + // console.log("live session link", this.liveLink);
  346 + // console.log("live session password", this.livePassword);
342 347  
343 348 if (username != "" || room != "") {
344 349 if (window.JitsiMeetExternalAPI) {
... ...
src/pages/Exam/examSchedule.vue
Diff comments   View file @7014df6
... ... @@ -418,7 +418,12 @@
418 418 </v-data-table>
419 419  
420 420 <!-- ****** ADD Exam Schedule ****** -->
421   - <v-dialog v-model="addExamScheduleDialog" max-width="600" v-if="addExamScheduleDialog" persistent>
  421 + <v-dialog
  422 + v-model="addExamScheduleDialog"
  423 + max-width="600"
  424 + v-if="addExamScheduleDialog"
  425 + persistent
  426 + >
422 427 <v-card flat class="card-style pa-2" dark>
423 428 <v-layout>
424 429 <v-flex xs12>
... ... @@ -946,6 +951,7 @@ export default {
946 951 this.subjects = this.classList[i].subjects;
947 952 }
948 953 }
  954 + this.ScheduleData = [];
949 955 http()
950 956 .get(
951 957 "/getSectionsList",
... ...
src/pages/Mark/mark.vue
Diff comments   View file @7014df6
... ... @@ -473,6 +473,7 @@ export default {
473 473 this.subjects = this.classList[i].subjects;
474 474 }
475 475 }
  476 + this.getStudentsList = [];
476 477 http()
477 478 .get(
478 479 "/getSectionsList",
... ...
src/pages/Report/idCard.vue
Diff comments   View file @7014df6
... ... @@ -644,6 +644,7 @@ export default {
644 644 },
645 645 getSections(_id) {
646 646 this.showLoader = true;
  647 + this.getCard = [];
647 648 http()
648 649 .get(
649 650 "/getSectionsList",
... ...
src/pages/Report/progressCardReport.vue
Diff comments   View file @7014df6
... ... @@ -425,7 +425,7 @@ export default {
425 425 filterData: [],
426 426 getStudentsList: [],
427 427 classRules: [(v) => !!v || "Class is required"],
428   - sectionRules: [(v) => !!v || "Class is required"],
  428 + sectionRules: [(v) => !!v || "Section is required"],
429 429 studentRules: [(v) => !!v || "Student is required"],
430 430 getReport: {},
431 431 classList: [],
... ... @@ -466,6 +466,10 @@ export default {
466 466 },
467 467 getSections(_id) {
468 468 this.showLoader = true;
  469 + this.cardData = [];
  470 + this.schoolData = [];
  471 + this.showReport = false;
  472 + this.filterData = [];
469 473 http()
470 474 .get(
471 475 "/getSectionsList",
... ...
src/pages/Students/students.vue
Diff comments   View file @7014df6
... ... @@ -855,7 +855,6 @@
855 855 item-text="name"
856 856 item-value="_id"
857 857 name="Select Section"
858   - :rules="sectionRules"
859 858 required
860 859 ></v-select>
861 860 </v-layout>
... ... @@ -960,8 +959,12 @@
960 959 </td>
961 960 <td class="text-xs-center td td-row">{{ props.item.name}}</td>
962 961 <td class="text-xs-center td td-row">{{ props.item.gender }}</td>
963   - <td class="text-xs-center td td-row">{{ props.item.parentId.fatherName }}</td>
964   - <td class="text-xs-center td td-row">{{ props.item.parentId.motherName }}</td>
  962 + <td
  963 + class="text-xs-center td td-row"
  964 + >{{ props.item.parentId ? props.item.parentId.fatherName: '-' }}</td>
  965 + <td
  966 + class="text-xs-center td td-row"
  967 + >{{ props.item.parentId ? props.item.parentId.motherName: '-' }}</td>
965 968 <td class="text-xs-center td td-row">{{ props.item.establishmentYear }}</td>
966 969 <!-- <td class="text-xs-center td td-row">{{ props.item.mobile}}</td> -->
967 970 <td class="text-xs-center td td-row">
... ... @@ -2111,6 +2114,7 @@ export default {
2111 2114 getSections(_id) {
2112 2115 var token = this.$store.state.token;
2113 2116 this.showLoader = true;
  2117 + this.studentsData = [];
2114 2118 http()
2115 2119 .get(
2116 2120 "/getSectionsList",
... ...
src/pages/TimeTable/timeTable.vue
Diff comments   View file @7014df6
... ... @@ -1077,6 +1077,7 @@ export default {
1077 1077 },
1078 1078 getSections(_id) {
1079 1079 var token = this.$store.state.token;
  1080 + this.desserts = [];
1080 1081 http()
1081 1082 .get(
1082 1083 "/getSectionsList",
... ...