Profile
-
- - {{ value[0].studentId.name }} -
-Student
-- Roll No: -
-{{ value[0].studentId.rollNo }}
-- Class: -
-{{value[0].classId.classNum }}
-- Section: -
-{{ value[0].sectionId.name}}
-Profile
+
+ + {{ value[0].studentId.name }} +
+Student
++ RollNo +
+: {{ value[0].studentId.rollNo }}
++ Class +
+: {{value[0].classId.classNum }}
++ Section +
+: {{ value[0].sectionId.name}}
+Mark
-| Subject | + + +||||||||||||||||
| Subject | +{{exam.markDistributionId.distributionType}} | +Total | +|
| Mark | {{exam.markDistributionId.distributionType}} | -Total | -|
| Mark | -Highest Mark | - -Mark | -|
| {{subject.subjectName}} | - -{{exam.marksScored}} | -{{exam.markDistributionId.markValue}} | - -{{subject.totalMarks}} | -
@@ -141,12 +194,14 @@ import _ from "underscore";
export default {
data: () => ({
- showLoader: false,
+ showLoader: true,
+ nameShow: false,
markData: [],
token: "",
markDistributions: [],
markParticularDistributionData: [],
- filterData: []
+ filterData: [],
+ output: null
}),
mounted() {
this.token = this.$store.state.token;
@@ -154,7 +209,7 @@ export default {
},
methods: {
getMarkList() {
- this.showLoader = false;
+ this.showLoader = true;
http()
.get("/getParticularMark", {
params: { studentId: this.$route.params.markId },
@@ -240,7 +295,7 @@ export default {
// }
// this.markData = aray;
// console.log("aray-2", aray);
- // this.showLoader = false;
+ this.showLoader = false;
})
.catch(error => {
// console.log("err====>", err);
@@ -253,6 +308,10 @@ export default {
this.$store.dispatch("Id", null);
}
});
+ },
+ print() {
+ // Pass the element id here
+ this.$htmlToPaper("printMe");
}
}
};
@@ -263,11 +322,13 @@ table {
border-collapse: collapse;
border: 1px solid #e2e7eb;
}
-
+tbody > tr > td,
+.table-bordered {
+ border: 1px solid #ddd;
+}
th,
td {
border: 1px solid #e2e7eb;
- padding: 10px;
text-align: center;
}
table.feeTypeTable {
@@ -286,6 +347,21 @@ table.feeTypeTable {
.bg-skyDark {
background-color: #956785;
}
+.loader {
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ top: 0;
+ left: 0;
+ text-align: center;
+ background-color: rgba(0, 0, 0, 0.5);
+ z-index: 999;
+}
+
+.loader > div {
+ position: relative;
+ top: calc(50% - 16px);
+}
@media screen and (max-width: 380px) {
.tableRsponsive {
display: block;
@@ -293,4 +369,21 @@ table.feeTypeTable {
overflow: scroll;
}
}
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/Report/progressCardReport.vue b/src/pages/Report/progressCardReport.vue
index 382bc07..60bd1dc 100644
--- a/src/pages/Report/progressCardReport.vue
+++ b/src/pages/Report/progressCardReport.vue
@@ -58,7 +58,7 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ Print
+ print
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
-
- {{value[0].examId.examName}}
-
-
-
+ {{subject.subjectName}}
+
+ {{exam.marksScored}}
+ {{exam.markDistributionId.markValue}}
+
+ {{subject.totalMarks}}
+
+
+
+
+
+
+
Profile
-
- - {{ value[0].studentId.name }} -
-Student
-- Roll No: -
-{{ value[0].studentId.rollNo }}
-- Class: -
-{{value[0].classId.classNum }}
-- Section: -
-{{ value[0].sectionId.name}}
-Profile
+
+ + {{ value[0].studentId.name }} +
+Student
++ RollNo +
+: {{ value[0].studentId.rollNo }}
++ Class +
+: {{value[0].classId.classNum }}
++ Section +
+: {{ value[0].sectionId.name}}
+Mark
-| Subject | + + +||||||||||||||||
| Subject | +{{exam.markDistributionId.distributionType}} | +Total | +|
| {{exam.markDistributionId.distributionType}} | -Total | -||
| Mark | -Highest Mark | - -Mark | -|
| {{subject.subjectName}} | - -{{exam.marksScored}} | -{{exam.markDistributionId.markValue}} | - -{{subject.totalMarks}} | -
@@ -241,7 +297,8 @@ export default {
sectionRules: [v => !!v || "Class is required"],
studentRules: [v => !!v || "Student is required"],
getReport: {},
- classList: []
+ classList: [],
+ output: null
}),
mounted() {
this.token = this.$store.state.token;
@@ -252,14 +309,17 @@ export default {
this.$refs.form.reset();
},
getClass() {
+ this.showLoader = true;
http()
.get("/getClassesList", {
headers: { Authorization: "Bearer " + this.token }
})
.then(response => {
this.classList = response.data.data;
+ this.showLoader = false;
})
.catch(err => {
+ this.showLoader = false;
// console.log("err====>", err);
});
},
@@ -299,7 +359,7 @@ export default {
});
},
getMarkReportList() {
- this.showLoader = false;
+ this.showLoader = true;
this.showReport = true;
http()
.get("/getParticularMark", {
@@ -312,81 +372,21 @@ export default {
newData[i].examination = newData[i].examId._id;
}
this.filterData = _.groupBy(newData, ["examination"]);
- console.log("check filtered data", this.filterData);
for (let data in this.filterData) {
- // console.log("this.filterData[data].length", this.filterData[data]);
for (let item in this.filterData[data]) {
- // console.log("check", this.filterData[data][item].studentsMarks);
var totalMarks = 0;
for (
let i = 0;
i < this.filterData[data][item].studentsMarks.length;
i++
) {
- // console.log(
- // "check data",
- // this.filterData[data][item].studentsMarks[i]
- // );
totalMarks += this.filterData[data][item].studentsMarks[i]
.marksScored;
}
this.filterData[data][item].totalMarks = totalMarks;
}
}
- // var aray = [];
- // this.markData = response.data.data;
- // for (let i = 0; i < this.markData.length; i++) {
- // console.log(this.markData[i].examId.examName);
- // let index = -1;
-
- // aray.forEach((dat_, k) => {
- // if (dat_.category == this.markData[i].examId.examName) {
- // index = k;
- // }
- // });
- // if (index == -1) {
- // var obj = {
- // category: this.markData[i].examId.examName,
- // extraData: []
- // };
- // obj.extraData.push(this.markData[i]);
- // aray.push(obj);
- // } else {
- // console.log("=o", this.markData[i]);
- // // aray[index].extraData =
-
- // aray[index].extraData.push(this.markData[i]);
- // }
- // console.log("aray-", aray);
-
- // for (let j = 0; j < this.markData[i].studentsMarks.length; j++) {
- // // console.log("this.studentsMarksSSSSSSSSSSSSS",this.markData[i].studentsMarks[j].marksObtained)
-
- // this.markDistributions = this.markData[i].studentsMarks[
- // j
- // ].marksObtained;
- // for (
- // let k = 0;
- // k < this.markData[i].studentsMarks[j].marksObtained.length;
- // k++
- // ) {
- // this.markParticularDistributionData.push(
- // this.markData[i].studentsMarks[j].marksObtained[k].marksScored
- // );
- // this.markParticularDistributionData.push(
- // this.markData[i].studentsMarks[j].marksObtained[k]
- // .markDistributionId.markValue
- // );
- // // console.log(
- // // "this.markParticularDistributionData",
- // // this.markParticularDistributionData
- // // );
- // }
- // }
- // }
- // this.markData = aray;
- // console.log("aray-2", aray);
- // this.showLoader = false;
+ this.showLoader = false;
})
.catch(error => {
// console.log("err====>", err);
@@ -399,6 +399,10 @@ export default {
this.$store.dispatch("Id", null);
}
});
+ },
+ print() {
+ // Pass the element id here
+ this.$htmlToPaper("printMe");
}
}
};
diff --git a/src/pages/Report/studentReport.vue b/src/pages/Report/studentReport.vue
index b3afa4c..954ce27 100644
--- a/src/pages/Report/studentReport.vue
+++ b/src/pages/Report/studentReport.vue
@@ -28,7 +28,7 @@
-
@@ -47,13 +47,13 @@
-
@@ -63,13 +63,13 @@
-
@@ -79,13 +79,13 @@
-
@@ -95,13 +95,13 @@
-
@@ -111,13 +111,13 @@
-
@@ -142,7 +142,7 @@
-
@@ -162,7 +162,7 @@
-
@@ -191,18 +191,6 @@
-
{
this.classList = response.data.data;
+ this.showLoader = false;
})
.catch(err => {
+ this.showLoader = false;
// console.log("err====>", err);
});
},