Compare View
Commits (3)
-
…dashboard into amber-development
Showing
9 changed files
Show diff stats
src/pages/Dashboard/LiveOnlineClass.vue
... | ... | @@ -251,6 +251,10 @@ export default { |
251 | 251 | }, 1000); |
252 | 252 | }); |
253 | 253 | |
254 | + _this.api.on("passwordRequired", () => { | |
255 | + _this.api.executeCommand("password", _this.roomPassword); | |
256 | + }); | |
257 | + | |
254 | 258 | _this.api.on("readyToClose", () => { |
255 | 259 | // this.$router.push({ name: "Refresh" }); |
256 | 260 | let jitsi = document.getElementById("jitsi-container"); | ... | ... |
src/pages/Parent/parents.vue
... | ... | @@ -40,19 +40,27 @@ |
40 | 40 | </v-flex> |
41 | 41 | </v-layout> |
42 | 42 | </v-flex> |
43 | + <!-- EDIT FATHER CELL NUMBER - HIDDEN AT xs and sm screen --> | |
43 | 44 | <v-flex xs12> |
44 | 45 | <v-layout> |
45 | 46 | <v-flex xs3 sm4 class="pt-4 subheading"> |
46 | 47 | <label class="right">Father Cell No:</label> |
47 | 48 | </v-flex> |
48 | 49 | <v-flex xs8 sm6 class="ml-3"> |
49 | - <v-text-field | |
50 | - v-model="editedItem.fatherCellNo" | |
51 | - placeholder="fill your father Cell Number" | |
52 | - :rules="editFatherNoRule" | |
53 | - type="number" | |
54 | - required | |
55 | - ></v-text-field> | |
50 | + <v-layout row wrap> | |
51 | + <v-flex md3 class="mt-3"> | |
52 | + <vue-country-code @onSelect="editFatherCellCode" class="black--text"></vue-country-code> | |
53 | + </v-flex> | |
54 | + <v-flex md9> | |
55 | + <v-text-field | |
56 | + v-model="editedItem.fatherCellNo" | |
57 | + placeholder="Fill your father Cell Number" | |
58 | + :rules="editFatherNoRule" | |
59 | + type="number" | |
60 | + required | |
61 | + ></v-text-field> | |
62 | + </v-flex> | |
63 | + </v-layout> | |
56 | 64 | </v-flex> |
57 | 65 | </v-layout> |
58 | 66 | </v-flex> |
... | ... | @@ -101,17 +109,25 @@ |
101 | 109 | </v-layout> |
102 | 110 | </v-flex> |
103 | 111 | <v-flex xs12> |
112 | + <!-- EDIT MOTHER CELL NUMBER - HIDDEN AT xs and sm screen --> | |
104 | 113 | <v-layout> |
105 | 114 | <v-flex xs3 sm4 class="pt-4 subheading"> |
106 | 115 | <label class="right">Mother Profession:</label> |
107 | 116 | </v-flex> |
108 | 117 | <v-flex xs8 sm6 class="ml-3"> |
109 | - <v-text-field | |
110 | - v-model="editedItem.motherProfession" | |
111 | - placeholder="fill your Mother Profession" | |
112 | - type="text" | |
113 | - required | |
114 | - ></v-text-field> | |
118 | + <v-layout row wrap> | |
119 | + <v-flex md3 class="mt-3"> | |
120 | + <vue-country-code @onSelect="onSelect" class="black--text"></vue-country-code> | |
121 | + </v-flex> | |
122 | + <v-flex md9> | |
123 | + <v-text-field | |
124 | + v-model="editedItem.motherProfession" | |
125 | + placeholder="fill your Mother Profession" | |
126 | + type="text" | |
127 | + required | |
128 | + ></v-text-field> | |
129 | + </v-flex> | |
130 | + </v-layout> | |
115 | 131 | </v-flex> |
116 | 132 | </v-layout> |
117 | 133 | <v-layout> |
... | ... | @@ -171,17 +187,25 @@ |
171 | 187 | </v-layout> |
172 | 188 | </v-flex> |
173 | 189 | <v-flex xs12> |
190 | + <!-- EDIT FATHER CELL NUMBER - visible AT xs and sm screen --> | |
174 | 191 | <v-layout wrap> |
175 | 192 | <v-flex xs12 class="pt-4 subheading"> |
176 | 193 | <label>Father Cell No:</label> |
177 | 194 | </v-flex> |
178 | 195 | <v-flex xs12> |
179 | - <v-text-field | |
180 | - v-model="editedItem.fatherCellNo" | |
181 | - placeholder="fill your father Cell Number" | |
182 | - type="number" | |
183 | - required | |
184 | - ></v-text-field> | |
196 | + <v-layout row wrap> | |
197 | + <v-flex sm3 class="mt-3"> | |
198 | + <vue-country-code @onSelect="editFatherCellCode" class="black--text"></vue-country-code> | |
199 | + </v-flex> | |
200 | + <v-flex sm9> | |
201 | + <v-text-field | |
202 | + v-model="editedItem.fatherCellNo" | |
203 | + placeholder="fill your father Cell Number" | |
204 | + type="number" | |
205 | + required | |
206 | + ></v-text-field> | |
207 | + </v-flex> | |
208 | + </v-layout> | |
185 | 209 | </v-flex> |
186 | 210 | </v-layout> |
187 | 211 | </v-flex> |
... | ... | @@ -215,17 +239,25 @@ |
215 | 239 | </v-layout> |
216 | 240 | </v-flex> |
217 | 241 | <v-flex xs12> |
242 | + <!-- EDIT MOTHER CELL NUMBER - VISIBLE ONLY AT xs and sm screen --> | |
218 | 243 | <v-layout wrap> |
219 | 244 | <v-flex xs12 class="pt-4 subheading"> |
220 | 245 | <label>Mother Cell No:</label> |
221 | 246 | </v-flex> |
222 | 247 | <v-flex xs12> |
223 | - <v-text-field | |
224 | - v-model="editedItem.motherCellNo" | |
225 | - placeholder="fill your Mother Cell Number" | |
226 | - type="number" | |
227 | - required | |
228 | - ></v-text-field> | |
248 | + <v-layout row wrap> | |
249 | + <v-flex sm3 class="mt-3"> | |
250 | + <vue-country-code @onSelect="onSelect" class="black--text"></vue-country-code> | |
251 | + </v-flex> | |
252 | + <v-flex sm9> | |
253 | + <v-text-field | |
254 | + v-model="editedItem.motherCellNo" | |
255 | + placeholder="fill your Mother Cell Number" | |
256 | + type="number" | |
257 | + required | |
258 | + ></v-text-field> | |
259 | + </v-flex> | |
260 | + </v-layout> | |
229 | 261 | </v-flex> |
230 | 262 | </v-layout> |
231 | 263 | </v-flex> |
... | ... | @@ -582,7 +614,7 @@ |
582 | 614 | <v-form ref="parentForm" v-model="valid" lazy-validation> |
583 | 615 | <v-container fluid class="hidden-xs-only hidden-sm-only"> |
584 | 616 | <v-layout> |
585 | - <!-- FATHER CELL NUMBER HIDDEN ON xs and sm screen--> | |
617 | + <!-- ADD FATHER CELL NUMBER HIDDEN ON xs and sm screen--> | |
586 | 618 | <v-flex xs12 sm6> |
587 | 619 | <v-layout> |
588 | 620 | <v-flex xs4 class="pt-4 subheading"> |
... | ... | @@ -591,7 +623,7 @@ |
591 | 623 | <v-flex xs8 class="ml-3"> |
592 | 624 | <v-layout row wrap> |
593 | 625 | <v-flex md3 class="mt-3"> |
594 | - <vue-country-code @onSelect="onSelect" class="black--text"></vue-country-code> | |
626 | + <vue-country-code @onSelect="addFatherCellCode" class="black--text"></vue-country-code> | |
595 | 627 | </v-flex> |
596 | 628 | <v-flex md9> |
597 | 629 | <v-text-field |
... | ... | @@ -748,7 +780,7 @@ |
748 | 780 | </v-container> |
749 | 781 | <v-container fluid class="hidden-lg-only hidden-xl-only hidden-md-only"> |
750 | 782 | <v-layout wrap> |
751 | - <!-- FATHER CELL NUMBER -- VISIBLE ON xs and sm screens --> | |
783 | + <!-- ADD FATHER CELL NUMBER -- VISIBLE ON xs and sm screens --> | |
752 | 784 | <v-flex xs12 sm6> |
753 | 785 | <v-layout wrap> |
754 | 786 | <v-flex xs12 class="pt-4 subheading"> |
... | ... | @@ -756,7 +788,7 @@ |
756 | 788 | </v-flex> |
757 | 789 | <v-layout row wrap xs12> |
758 | 790 | <v-flex sm3 class="mt-3"> |
759 | - <vue-country-code @onSelect="onSelect" class="black--text"></vue-country-code> | |
791 | + <vue-country-code @onSelect="addFatherCellCode" class="black--text"></vue-country-code> | |
760 | 792 | </v-flex> |
761 | 793 | |
762 | 794 | <v-flex sm9> |
... | ... | @@ -920,6 +952,10 @@ import moment from "moment"; |
920 | 952 | |
921 | 953 | export default { |
922 | 954 | data: () => ({ |
955 | + /* EDIT FATHER CELL */ | |
956 | + editedFatherCellCode: '', | |
957 | + /* ADD FATHER CELL */ | |
958 | + addedFatherCellCode: '', | |
923 | 959 | e1: true, |
924 | 960 | showParent: true, |
925 | 961 | snackbar: false, |
... | ... | @@ -1043,7 +1079,15 @@ export default { |
1043 | 1079 | }, |
1044 | 1080 | methods: { |
1045 | 1081 | onSelect({ name, iso2, dialCode }) { |
1046 | - console.log("country codes", name, iso2, dialCode); | |
1082 | + // console.log("country codes", name, iso2, dialCode); | |
1083 | + // this.countryCode = iso2 | |
1084 | + }, | |
1085 | + editFatherCellCode({ name, iso2, dialCode }){ | |
1086 | + // console.log("Edit father cell", name,iso2); | |
1087 | + this.editedFatherCellCode = iso2 | |
1088 | + }, | |
1089 | + addFatherCellCode({ name, iso2, dialCode }){ | |
1090 | + this.addedFatherCellCode = iso2 | |
1047 | 1091 | }, |
1048 | 1092 | editItem(item) { |
1049 | 1093 | this.editedIndex = this.parentsList.indexOf(item); |
... | ... | @@ -1074,6 +1118,7 @@ export default { |
1074 | 1118 | save() { |
1075 | 1119 | if (this.$refs.editParentForm.validate()) { |
1076 | 1120 | this.editedItem.parentId = this.editedItem._id; |
1121 | + this.editedItem.countryCode = this.editedFatherCellCode; | |
1077 | 1122 | http() |
1078 | 1123 | .put("/updateParent", this.editedItem) |
1079 | 1124 | .then((response) => { |
... | ... | @@ -1123,6 +1168,7 @@ export default { |
1123 | 1168 | if (this.$refs.parentForm.validate()) { |
1124 | 1169 | this.parentData.role = "PARENT"; |
1125 | 1170 | this.loading = true; |
1171 | + this.parentData.countryCode = this.addedFatherCellCode, | |
1126 | 1172 | await http() |
1127 | 1173 | .post("/createParent", this.parentData) |
1128 | 1174 | .then((response) => { | ... | ... |
src/pages/Students/students.vue
... | ... | @@ -294,6 +294,7 @@ |
294 | 294 | </v-flex> |
295 | 295 | </v-layout> |
296 | 296 | </v-flex> |
297 | + <!-- EDIT DETAILS - MOBILE NUMBER --> | |
297 | 298 | <v-flex xs12 sm4> |
298 | 299 | <v-layout> |
299 | 300 | <v-flex xs4 class="pt-4 subheading"> |
... | ... | @@ -301,13 +302,20 @@ |
301 | 302 | <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Mobile:</label> |
302 | 303 | </v-flex> |
303 | 304 | <v-flex xs8 class="ml-3"> |
304 | - <v-text-field | |
305 | - v-model="editedItem.mobile" | |
306 | - placeholder="fill your MobileNo" | |
307 | - name="mobileNo" | |
308 | - type="number" | |
309 | - required | |
310 | - ></v-text-field> | |
305 | + <v-layout row wrap> | |
306 | + <v-flex xs3 class="mt-3"> | |
307 | + <vue-country-code @onSelect="editStudentMobileCode" class="black--text"></vue-country-code> | |
308 | + </v-flex> | |
309 | + <v-flex xs9> | |
310 | + <v-text-field | |
311 | + v-model="editedItem.mobile" | |
312 | + placeholder="fill your MobileNo" | |
313 | + name="mobileNo" | |
314 | + type="number" | |
315 | + required | |
316 | + ></v-text-field> | |
317 | + </v-flex> | |
318 | + </v-layout> | |
311 | 319 | </v-flex> |
312 | 320 | </v-layout> |
313 | 321 | </v-flex> |
... | ... | @@ -1055,7 +1063,10 @@ |
1055 | 1063 | <v-flex xs12> |
1056 | 1064 | <v-layout row wrap xs12> |
1057 | 1065 | <v-flex sm3 class="mt-3"> |
1058 | - <vue-country-code @onSelect="onSelect" class="black--text"></vue-country-code> | |
1066 | + <vue-country-code | |
1067 | + @onSelect="addFatherCellCode" | |
1068 | + class="black--text" | |
1069 | + ></vue-country-code> | |
1059 | 1070 | </v-flex> |
1060 | 1071 | |
1061 | 1072 | <v-flex sm9> |
... | ... | @@ -1240,7 +1251,10 @@ |
1240 | 1251 | <v-flex xs8 class="ml-3"> |
1241 | 1252 | <v-layout row wrap> |
1242 | 1253 | <v-flex md3 class="mt-3"> |
1243 | - <vue-country-code @onSelect="onSelect" class="black--text"></vue-country-code> | |
1254 | + <vue-country-code | |
1255 | + @onSelect="addFatherCellCode" | |
1256 | + class="black--text" | |
1257 | + ></vue-country-code> | |
1244 | 1258 | </v-flex> |
1245 | 1259 | <v-flex md9> |
1246 | 1260 | <v-text-field |
... | ... | @@ -1633,12 +1647,22 @@ |
1633 | 1647 | >Mobile:</label> |
1634 | 1648 | </v-flex> |
1635 | 1649 | <v-flex xs8 class="ml-3"> |
1636 | - <v-text-field | |
1637 | - v-model="addStudents.mobile" | |
1638 | - placeholder="fill your MobileNo" | |
1639 | - name="mobileNo" | |
1640 | - type="number" | |
1641 | - ></v-text-field> | |
1650 | + <v-layout row wrap> | |
1651 | + <v-flex xs3 class="mt-3"> | |
1652 | + <vue-country-code | |
1653 | + @onSelect="addStudentMobileCode" | |
1654 | + class="black--text" | |
1655 | + ></vue-country-code> | |
1656 | + </v-flex> | |
1657 | + <v-flex xs9> | |
1658 | + <v-text-field | |
1659 | + v-model="addStudents.mobile" | |
1660 | + placeholder="fill your MobileNo" | |
1661 | + name="mobileNo" | |
1662 | + type="number" | |
1663 | + ></v-text-field> | |
1664 | + </v-flex> | |
1665 | + </v-layout> | |
1642 | 1666 | </v-flex> |
1643 | 1667 | </v-layout> |
1644 | 1668 | </v-flex> |
... | ... | @@ -1943,6 +1967,11 @@ import parent from "@/script/parents.js"; |
1943 | 1967 | |
1944 | 1968 | export default { |
1945 | 1969 | data: () => ({ |
1970 | + /* EDIT DETAILS MOBILE */ | |
1971 | + editedStudentMobileCode: "", | |
1972 | + /* ADD FATHER CELL */ | |
1973 | + addedFatherCellCode: "", | |
1974 | + addedStudentMobileCode: '', | |
1946 | 1975 | e1: true, |
1947 | 1976 | e2: 0, |
1948 | 1977 | showParent: true, |
... | ... | @@ -2123,8 +2152,18 @@ export default { |
2123 | 2152 | }, |
2124 | 2153 | }, |
2125 | 2154 | methods: { |
2155 | + editStudentMobileCode({ name, iso2, dialCode }) { | |
2156 | + // console.log("Edit father cell", name,iso2); | |
2157 | + this.editedStudentMobileCode = iso2; | |
2158 | + }, | |
2159 | + addFatherCellCode({ name, iso2, dialCode }) { | |
2160 | + this.addedFatherCellCode = iso2; | |
2161 | + }, | |
2162 | + addStudentMobileCode({ name, iso2, dialCode }){ | |
2163 | + this.addedStudentMobileCode =iso2; | |
2164 | + }, | |
2126 | 2165 | onSelect({ name, iso2, dialCode }) { |
2127 | - console.log("country codes", name, iso2, dialCode); | |
2166 | + // console.log("country codes", name, iso2, dialCode); | |
2128 | 2167 | }, |
2129 | 2168 | findStudents() { |
2130 | 2169 | this.showLoader = true; |
... | ... | @@ -2307,6 +2346,7 @@ export default { |
2307 | 2346 | country: this.addStudents.country, |
2308 | 2347 | permanentAddress: this.addStudents.permanentAddress, |
2309 | 2348 | presentAddress: this.addStudents.presentAddress, |
2349 | + countryCode: this.addedStudentMobileCode, | |
2310 | 2350 | mobile: this.addStudents.mobile, |
2311 | 2351 | state: this.addStudents.state, |
2312 | 2352 | gender: this.addStudents.gender, |
... | ... | @@ -2410,6 +2450,7 @@ export default { |
2410 | 2450 | let addparentDetails = { |
2411 | 2451 | email: this.parentData.email, |
2412 | 2452 | fatherName: this.parentData.fatherName, |
2453 | + countryCode: this.addedFatherCellCode, | |
2413 | 2454 | fatherCellNo: this.parentData.fatherCellNo, |
2414 | 2455 | motherName: this.parentData.motherName, |
2415 | 2456 | motherCellNo: this.parentData.motherCellNo, | ... | ... |
src/pages/Teachers/teachers.vue
... | ... | @@ -154,6 +154,7 @@ |
154 | 154 | </v-flex> |
155 | 155 | </v-layout> |
156 | 156 | <v-layout wrap> |
157 | + <!-- EDIT DETAILS MOBILE NUMBER --> | |
157 | 158 | <v-flex xs12 sm6> |
158 | 159 | <v-layout> |
159 | 160 | <v-flex xs4 class="pt-4 subheading"> |
... | ... | @@ -161,12 +162,19 @@ |
161 | 162 | <label class="right hidden-lg-only hidden-md-only hidden-xl-only">Mobile:</label> |
162 | 163 | </v-flex> |
163 | 164 | <v-flex xs8 class="ml-3"> |
164 | - <v-text-field | |
165 | - v-model="editedItem.mobileNo" | |
166 | - placeholder="fill your MobileNo" | |
167 | - type="number" | |
168 | - required | |
169 | - ></v-text-field> | |
165 | + <v-layout row wrap> | |
166 | + <v-flex xs3 class="mt-3"> | |
167 | + <vue-country-code @onSelect="editMobileCode" class="black--text"></vue-country-code> | |
168 | + </v-flex> | |
169 | + <v-flex xs9> | |
170 | + <v-text-field | |
171 | + v-model="editedItem.mobileNo" | |
172 | + placeholder="Fill MobileNo" | |
173 | + type="number" | |
174 | + required | |
175 | + ></v-text-field> | |
176 | + </v-flex> | |
177 | + </v-layout> | |
170 | 178 | </v-flex> |
171 | 179 | </v-layout> |
172 | 180 | </v-flex> |
... | ... | @@ -722,6 +730,7 @@ |
722 | 730 | </v-layout> |
723 | 731 | </v-flex> |
724 | 732 | </v-layout> |
733 | + <!-- ADD TEACHER MOBILE --> | |
725 | 734 | <v-layout wrap> |
726 | 735 | <v-flex xs12 sm6> |
727 | 736 | <v-layout> |
... | ... | @@ -732,7 +741,7 @@ |
732 | 741 | <v-flex xs8 class="ml-3"> |
733 | 742 | <v-layout row wrap> |
734 | 743 | <v-flex xs3 class="mt-3"> |
735 | - <vue-country-code @onSelect="onSelect" class="black--text"></vue-country-code> | |
744 | + <vue-country-code @onSelect="addTeacherMobileCode" class="black--text"></vue-country-code> | |
736 | 745 | </v-flex> |
737 | 746 | <v-flex xs9> |
738 | 747 | <v-text-field |
... | ... | @@ -938,6 +947,10 @@ import countryList from "@/script/country.js"; |
938 | 947 | |
939 | 948 | export default { |
940 | 949 | data: () => ({ |
950 | + /* EDIT MOBILE CELL */ | |
951 | + editedMobileCode: '', | |
952 | + /* ADD FATHER CELL */ | |
953 | + addedTeacherMobileCode: '', | |
941 | 954 | component: "report-generate", |
942 | 955 | snackbar: false, |
943 | 956 | y: "top", |
... | ... | @@ -1070,7 +1083,16 @@ export default { |
1070 | 1083 | }, |
1071 | 1084 | methods: { |
1072 | 1085 | onSelect({ name, iso2, dialCode }) { |
1073 | - console.log("country codes", name, iso2, dialCode); | |
1086 | + // console.log("country codes", name, iso2, dialCode); | |
1087 | + }, | |
1088 | + editMobileCode({ name, iso2, dialCode }){ | |
1089 | + // console.log("Edit father cell", name,iso2); | |
1090 | + this.editedMobileCode = iso2 | |
1091 | + console.log("Edit code - ",this.editedMobileCode) | |
1092 | + }, | |
1093 | + addTeacherMobileCode({ name, iso2, dialCode }){ | |
1094 | + this.addedTeacherMobileCode = iso2 | |
1095 | + console.log("Add code - ",this.addedTeacherMobileCode) | |
1074 | 1096 | }, |
1075 | 1097 | save(date) { |
1076 | 1098 | this.$refs.menu.save(date); |
... | ... | @@ -1191,6 +1213,7 @@ export default { |
1191 | 1213 | country: this.addTeachers.country, |
1192 | 1214 | permanentAddress: this.addTeachers.permanentAddress, |
1193 | 1215 | presentAddress: this.addTeachers.presentAddress, |
1216 | + countryCode: this.addedTeacherMobileCode, | |
1194 | 1217 | mobileNo: this.addTeachers.mobileNo, |
1195 | 1218 | state: this.addTeachers.state, |
1196 | 1219 | joinDate: this.addTeachers.joinDate, |
... | ... | @@ -1238,6 +1261,7 @@ export default { |
1238 | 1261 | country: this.editedItem.country, |
1239 | 1262 | permanentAddress: this.editedItem.permanentAddress, |
1240 | 1263 | presentAddress: this.editedItem.presentAddress, |
1264 | + countryCode: this.editedMobileCode, | |
1241 | 1265 | mobileNo: this.editedItem.mobileNo, |
1242 | 1266 | state: this.editedItem.state, |
1243 | 1267 | joinDate: this.editedItem.joinDate, | ... | ... |
src/pages/User/user.vue
... | ... | @@ -172,19 +172,27 @@ |
172 | 172 | </v-flex> |
173 | 173 | </v-layout> |
174 | 174 | <v-layout wrap> |
175 | + <!-- EDIT DETAILS - PHONE NUMBER --> | |
175 | 176 | <v-flex xs12 sm6> |
176 | 177 | <v-layout> |
177 | 178 | <v-flex xs4 class="pt-4 subheading"> |
178 | 179 | <label class="right">Phone:</label> |
179 | 180 | </v-flex> |
180 | 181 | <v-flex xs8 class="ml-3"> |
181 | - <v-text-field | |
182 | - v-model="editedItem.phone" | |
183 | - placeholder="fill your MobileNo" | |
184 | - name="mobileNo" | |
185 | - type="number" | |
186 | - required | |
187 | - ></v-text-field> | |
182 | + <v-layout row wrap> | |
183 | + <v-flex xs3 class="mt-3"> | |
184 | + <vue-country-code @onSelect="editPhoneNumberCode" class="black--text"></vue-country-code> | |
185 | + </v-flex> | |
186 | + <v-flex xs9> | |
187 | + <v-text-field | |
188 | + v-model="editedItem.phone" | |
189 | + placeholder="Fill MobileNo" | |
190 | + name="mobileNo" | |
191 | + type="number" | |
192 | + required | |
193 | + ></v-text-field> | |
194 | + </v-flex> | |
195 | + </v-layout> | |
188 | 196 | </v-flex> |
189 | 197 | </v-layout> |
190 | 198 | </v-flex> |
... | ... | @@ -650,6 +658,7 @@ |
650 | 658 | </v-flex> |
651 | 659 | </v-layout> |
652 | 660 | <v-layout> |
661 | + <!-- ADD PHONE NUMBER --> | |
653 | 662 | <v-flex xs12 sm6> |
654 | 663 | <v-layout> |
655 | 664 | <v-flex xs4 class="pt-4 subheading"> |
... | ... | @@ -658,7 +667,7 @@ |
658 | 667 | <v-flex xs8 class="ml-3"> |
659 | 668 | <v-layout row wrap> |
660 | 669 | <v-flex xs3 class="mt-3"> |
661 | - <vue-country-code @onSelect="onSelect" class="black--text"></vue-country-code> | |
670 | + <vue-country-code @onSelect="addPhoneNumberCode" class="black--text"></vue-country-code> | |
662 | 671 | </v-flex> |
663 | 672 | <v-flex xs9> |
664 | 673 | <v-text-field |
... | ... | @@ -785,6 +794,10 @@ import _ from "lodash"; |
785 | 794 | |
786 | 795 | export default { |
787 | 796 | data: () => ({ |
797 | + /* EDIT FATHER CELL */ | |
798 | + editedPhoneNumberCode: '', | |
799 | + /* ADD FATHER CELL */ | |
800 | + addedPhoneNumberCode: '', | |
788 | 801 | component: "report-generate", |
789 | 802 | snackbar: false, |
790 | 803 | y: "top", |
... | ... | @@ -920,9 +933,15 @@ export default { |
920 | 933 | }, |
921 | 934 | }, |
922 | 935 | methods: { |
923 | - onSelect({ name, iso2, dialCode }) { | |
924 | - console.log("country codes", name, iso2, dialCode); | |
936 | + editPhoneNumberCode({ name, iso2, dialCode }){ | |
937 | + this.editedPhoneNumberCode = iso2 | |
938 | + }, | |
939 | + addPhoneNumberCode({ name, iso2, dialCode }){ | |
940 | + this.addedPhoneNumberCode = iso2 | |
925 | 941 | }, |
942 | + // onSelect({ name, iso2, dialCode }) { | |
943 | + // console.log("country codes", name, iso2, dialCode); | |
944 | + // }, | |
926 | 945 | save(date) { |
927 | 946 | this.$refs.menu.save(date); |
928 | 947 | }, |
... | ... | @@ -1045,6 +1064,7 @@ export default { |
1045 | 1064 | religion: this.addUser.religion, |
1046 | 1065 | role: this.addUser.role, |
1047 | 1066 | address: this.addUser.presentAddress, |
1067 | + countryCode: this.addedPhoneNumberCode, | |
1048 | 1068 | phone: this.addUser.mobileNo, |
1049 | 1069 | religion: this.addUser.religion, |
1050 | 1070 | joiningDate: this.addUser.joinDate, |
... | ... | @@ -1087,6 +1107,7 @@ export default { |
1087 | 1107 | } |
1088 | 1108 | } |
1089 | 1109 | this.editedItem.userId = this.editedItem._id; |
1110 | + this.editedItem.countryCode = this.editedPhoneNumberCode | |
1090 | 1111 | if (this.imageUrl) { |
1091 | 1112 | var str = this.imageUrl; |
1092 | 1113 | const [baseUrl, imageUrl] = str.split(/,/); | ... | ... |
src/script/parents.js
... | ... | @@ -6,6 +6,7 @@ export default () => { |
6 | 6 | "motherName": "Rita", |
7 | 7 | "motherCellNo": "8989786789", |
8 | 8 | "fatherCellNo": "9898981234", |
9 | + "countryCode": "IN", | |
9 | 10 | "password": "" |
10 | 11 | |
11 | 12 | }, |
... | ... | @@ -14,6 +15,7 @@ export default () => { |
14 | 15 | "fatherName": "suresh", |
15 | 16 | "motherName": "rita kumari", |
16 | 17 | "fatherCellNo": "9898987867", |
18 | + "countryCode": "IN", | |
17 | 19 | "motherCellNo": "9768576536", |
18 | 20 | "password": "" |
19 | 21 | } | ... | ... |
src/script/students.js
... | ... | @@ -18,6 +18,7 @@ export default () => { |
18 | 18 | "allergies": "No", |
19 | 19 | "establishmentYear": "2019", |
20 | 20 | "fatherCellNo": "09988772222", |
21 | + "countryCode": "IN", | |
21 | 22 | "fatherName": "Raj", |
22 | 23 | "parentEmail": "rajkumar123@gmail.com", |
23 | 24 | "motherCellNo": "8877112266", |
... | ... | @@ -40,6 +41,7 @@ export default () => { |
40 | 41 | "gender": "Male", |
41 | 42 | "bloodGroup": "A+", |
42 | 43 | "mobile": "8077362128", |
44 | + "countryCode": "IN", | |
43 | 45 | "height": "5'8", |
44 | 46 | "medicalNotes": "No", |
45 | 47 | "motherCellNo": "7878654323", |
... | ... | @@ -51,6 +53,7 @@ export default () => { |
51 | 53 | "establishmentYear": "2019", |
52 | 54 | "parentEmail": "SureshKumar321@gmail.com", |
53 | 55 | "fatherCellNo": "09898787865", |
56 | + "countryCode": "IN", | |
54 | 57 | "fatherName": "Suresh Kumar", |
55 | 58 | "motherName": "Shinki", |
56 | 59 | "permanentAddress": "Sector 43 Chandigarh", | ... | ... |
src/script/teachers.js
... | ... | @@ -7,6 +7,7 @@ export default () => { |
7 | 7 | "city": "Chandigarh", |
8 | 8 | "country": "India", |
9 | 9 | "presentAddress": "SCO 34 second floor", |
10 | + "countryCode": "IN", | |
10 | 11 | "mobileNo": "08558875847", |
11 | 12 | "state": "Chandigarh", |
12 | 13 | "pincode": "160071", |
... | ... | @@ -19,6 +20,7 @@ export default () => { |
19 | 20 | "city": "Mohali", |
20 | 21 | "country": "India", |
21 | 22 | "presentAddress": "sector 71 Mohali", |
23 | + "countryCode": "IN", | |
22 | 24 | "mobileNo": "7009191451", |
23 | 25 | "state": "Punjab", |
24 | 26 | "pincode": "160072", |
... | ... | @@ -31,6 +33,7 @@ export default () => { |
31 | 33 | "city": "Phanckula", |
32 | 34 | "country": "India", |
33 | 35 | "presentAddress": "sector 71 Mohali", |
36 | + "countryCode": "IN", | |
34 | 37 | "mobileNo": "8989981451", |
35 | 38 | "state": "haryana", |
36 | 39 | "pincode": "160073", | ... | ... |
src/script/users.js
... | ... | @@ -9,6 +9,7 @@ export default () => { |
9 | 9 | "religion": "Hindu", |
10 | 10 | "address": "Mohali", |
11 | 11 | "phone": "1234567890", |
12 | + "countryCode": "IN", | |
12 | 13 | "joiningDate": "17-08-2016", |
13 | 14 | }, |
14 | 15 | { |
... | ... | @@ -20,6 +21,7 @@ export default () => { |
20 | 21 | "religion": "Hindu", |
21 | 22 | "address": "Punjab", |
22 | 23 | "phone": "9878768790", |
24 | + "countryCode": "IN", | |
23 | 25 | "joiningDate": "28-03-2016", |
24 | 26 | } |
25 | 27 | ] | ... | ... |