diff --git a/src/api/menu.js b/src/api/menu.js index 7149656..bf1a715 100644 --- a/src/api/menu.js +++ b/src/api/menu.js @@ -218,7 +218,7 @@ const schoolMenu = [ { title: 'Dashboard', // group: 'apps', - name: 'Dashboard', + name: 'View School Dashboard', icon: '/static/icon/dashboard.png', }, { diff --git a/src/pages/Authentication/Login.vue b/src/pages/Authentication/Login.vue index bd90457..7578119 100644 --- a/src/pages/Authentication/Login.vue +++ b/src/pages/Authentication/Login.vue @@ -126,7 +126,7 @@ export default { } else if (response.data.data.role === "SUPERADMIN") { this.$store.dispatch("setSchoolRole", response.data.data.role); this.$store.dispatch("setSchoolToken", response.data.data.token); - this.$router.push("/dashboard"); + this.$router.push("/schooldashboard"); } else if (response.data.data.role === "LIBRARIAN") { this.$store.dispatch("setToken", response.data.data.token); this.$store.dispatch("Id", response.data.data.id); @@ -157,9 +157,9 @@ export default { if (this.$store.state.isUserLoggedIn == true) { this.$router.push("/dashboard"); } - else if (this.$store.state.isSchoolLoggedIn == true) { - this.$router.push("/dashboard"); - } + // else if (this.$store.state.isSchoolLoggedIn == true) { + // this.$router.push("/dashboard"); + // } }, computed: { color() { diff --git a/src/pages/Mark/mark.vue b/src/pages/Mark/mark.vue index 297bb93..02425ba 100644 --- a/src/pages/Mark/mark.vue +++ b/src/pages/Mark/mark.vue @@ -536,9 +536,13 @@ export default { for (var j = 0; j < response.data.data.length; j++) { this.getStudentData[n].marksObtained.push({ markDistributionId: response.data.data[j]._id, - marksScored: 0 + marksScored: "" }); } + // if (marks.marksScored > marks.marksObtained) { + // this.getStudentData[n].marksScored = this.getStudentData[n].marksObtained; + // this.marks.marksScored = marks.marksObtained; + // } } }) .catch(error => { @@ -575,6 +579,10 @@ export default { this.text = error.response.data.message; this.color = "red"; }); + // if (data.marksScored > data.marksObtained) { + // this.getStudentData[j].marksScored = this.getStudentData[j].marksObtained; + // this.data.marksScored = data.marksObtained; + // } } }, getStudents() { diff --git a/src/pages/Mark/viewMark.vue b/src/pages/Mark/viewMark.vue index bde2ead..eda86ce 100644 --- a/src/pages/Mark/viewMark.vue +++ b/src/pages/Mark/viewMark.vue @@ -60,7 +60,7 @@ border-collapse: collapse;!important table-layout: auto !important; width: 100% !important; - " + overflow: hidden;" > @@ -74,7 +74,7 @@ v-for="studentMark in studentData.studentsMarks" style="border: 1px solid lightgrey !important;padding: 10px;" >{{studentMark.markDistributionId.distributionType}} - Total + Total Marks - Mark + diff --git a/src/pages/Report/progressCardReport.vue b/src/pages/Report/progressCardReport.vue index 7502a69..dd44300 100644 --- a/src/pages/Report/progressCardReport.vue +++ b/src/pages/Report/progressCardReport.vue @@ -87,7 +87,7 @@ - + @@ -100,27 +100,40 @@ > - logo -

{{ userData.name }}

-

{{ userData.address }}

- - - - - - -

{{ value[0].studentId.name }}

-

Class : {{ value[0].classId.classNum }}

-

Section : {{ value[0].sectionId.name }}

-

Roll NO : {{ value[0].studentId.rollNo }}

+
+ +
+

{{ userData.name }}

+
+
+
+ +

{{ userData.name }}

+

{{ userData.address }}

+ + + + + + +
+

{{ value[0].studentId.name }}

+

Class : {{ value[0].classId.classNum }}

+

Section : {{ value[0].sectionId.name }}

+

Roll NO : {{ value[0].studentId.rollNo }}

+
+ +
@@ -416,6 +429,42 @@ table.feeTypeTable { .bg-skyDark { background-color: #956785; } + +/* .report { + overflow: hidden; + max-width: 794px; + margin: 0px auto; + margin-bottom: 10px; + padding: 30px; +} */ +.line { + border-bottom: 1px solid #ddd; + overflow: hidden; + padding-bottom: 10px; + vertical-align: middle; + margin-bottom: 4px; +} +.school-logo { + float: left; +} +.school-name { + box-sizing: border-box; +} +.school-info { + width: 100%; + overflow: hidden; +} +.school-address { + float: left; + width: 40%; +} +.student-data { + float: right; + width: 40%; +} +.student-info { + float: left; +} @media screen and (max-width: 380px) { .tableRsponsive { /* display: block; */ diff --git a/src/pages/School/school.vue b/src/pages/School/school.vue index e4162a8..f4303e3 100644 --- a/src/pages/School/school.vue +++ b/src/pages/School/school.vue @@ -913,8 +913,7 @@ export default { this.loading = true; http() .post("/createSchool", this.addSchool, { - headers: { Authorization: "Bearer " + this.schoolToken } - + headers: { Authorization: "Bearer " + this.schoolToken } }) .then(response => { this.snackbar = true; @@ -969,10 +968,13 @@ export default { this.$store.dispatch("setToken", response.data.data.token); this.$store.dispatch("Id", response.data.data.id); this.$store.dispatch("Role", response.data.data.role); - let routeData = this.$router.resolve({ - name: "dashboardAdmin" - }); - window.open(routeData.href, "_blank"); + this.$router.push("/dashboard"); + location.reload(); + // let routeData = this.$router.resolve({ + // name: "dashboardAdmin" + // }); + // window.open(routeData.href, "_blank"); + this.showLoader = false; }) .catch(error => { @@ -986,7 +988,7 @@ export default { }; http() .put("/suspendSchoolAccount", suspendStatusData, { - headers: { Authorization: "Bearer " + this.schoolToken } + headers: { Authorization: "Bearer " + this.schoolToken } }) .then(response => { this.getSchool(); diff --git a/src/pages/School/viewSchoolDashboard.vue b/src/pages/School/viewSchoolDashboard.vue index 2765b4d..7405dbf 100644 --- a/src/pages/School/viewSchoolDashboard.vue +++ b/src/pages/School/viewSchoolDashboard.vue @@ -1,369 +1,476 @@ - - \ No newline at end of file diff --git a/src/router/paths.js b/src/router/paths.js index 478ff9f..e0131a2 100644 --- a/src/router/paths.js +++ b/src/router/paths.js @@ -685,7 +685,7 @@ export default [{ ) }, { - path: '/schooldashboard/:schoolId', + path: '/schooldashboard', meta: {}, name: 'View School Dashboard', props: (route) => ({ type: route.query.type }), diff --git a/static/css/custom.css b/static/css/custom.css index b718321..4126303 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -151,6 +151,9 @@ h4 { .apexcharts-canvas > svg{ width: 100% !important; } +.apexcharts-canvas > svg > apexcharts-inner > apexcharts-graphical { + transform: translate(0); +} #dialog { height: 550px;