Commit 4d8198ee43757b13c30274ffed3513ec7bcb9d38
1 parent
c5110e9005
Exists in
master
and in
3 other branches
implement pdf funtionality view mark and orgress report
Showing
2 changed files
with
324 additions
and
219 deletions
Show diff stats
src/pages/Mark/viewMark.vue
... | ... | @@ -24,7 +24,7 @@ |
24 | 24 | <!-- ****** TABLE DATA MARK ****** --> |
25 | 25 | <v-flex xs12 sm12 md12> |
26 | 26 | <v-layout> |
27 | - <v-flex xs12 sm12 md12 class="text-xs-center"> | |
27 | + <v-flex xs12 sm12 md12 style="text-align:center"> | |
28 | 28 | <!-- <img :src="userData.schoolLogoUrl" width="140" alt="logo" /> --> |
29 | 29 | <v-avatar> |
30 | 30 | <img :src="userData.schoolLogoUrl" v-if="userData.schoolLogoUrl" /> |
... | ... | @@ -33,15 +33,31 @@ |
33 | 33 | v-else-if="!userData.schoolLogoUrl" |
34 | 34 | /> |
35 | 35 | </v-avatar> |
36 | - <p class="title">{{ userData.name }}</p> | |
37 | - <p>{{ userData.address }}</p> | |
36 | + <p | |
37 | + style=" | |
38 | + font-size: 20px !important; | |
39 | + font-weight: 500; | |
40 | + line-height: 2 !important; | |
41 | + letter-spacing: 0.02em !important;" | |
42 | + >{{ userData.name }}</p> | |
43 | + <p style="margin-bottom: 16px;">{{ userData.address }}</p> | |
38 | 44 | </v-flex> |
39 | 45 | </v-layout> |
40 | 46 | <v-layout wrap> |
41 | - <v-flex xs12 sm12 md4> | |
42 | - <v-card> | |
43 | - <v-layout class="py-4"> | |
44 | - <v-avatar class="mx-auto" size="70"> | |
47 | + <v-flex xs12 sm12 md3> | |
48 | + <v-card | |
49 | + style=" | |
50 | + margin:auto 4px; | |
51 | + padding:20px; | |
52 | + background-color: #fff; | |
53 | + border-color: #fff; | |
54 | + color: rgba(0,0,0,0.87); | |
55 | + border: 1px solid rgb(226, 231, 235); | |
56 | + -webkit-box-shadow:inherit !important; | |
57 | + box-shadow: inherit !important;" | |
58 | + > | |
59 | + <v-layout style="padding:20px;"> | |
60 | + <v-avatar size="80" style="margin:10px auto;"> | |
45 | 61 | <img src="/static/icon/user.png" v-if="!markData[0].studentId.profilePicUrl" /> |
46 | 62 | <img |
47 | 63 | :src="markData[0].studentId.profilePicUrl" |
... | ... | @@ -49,44 +65,64 @@ |
49 | 65 | /> |
50 | 66 | </v-avatar> |
51 | 67 | </v-layout> |
52 | - <v-layout class="pa-2"> | |
68 | + <v-layout | |
69 | + style=" | |
70 | + margin-bottom: -1px; | |
71 | + border: 1px solid #ddd; | |
72 | + margin: 0px;" | |
73 | + > | |
53 | 74 | <v-flex xs6 sm6> |
54 | - <h4 class="right"> | |
75 | + <h4 style="float:right;margin: 4px 0px;"> | |
55 | 76 | <b>Name :</b> |
56 | 77 | </h4> |
57 | 78 | </v-flex> |
58 | 79 | <v-flex sm6 xs6> |
59 | - <h4>{{ markData[0].studentId.name }}</h4> | |
80 | + <h4 style="float:left;margin: 4px 0px;">{{ markData[0].studentId.name }}</h4> | |
60 | 81 | </v-flex> |
61 | 82 | </v-layout> |
62 | - <v-layout class="pa-2"> | |
83 | + <v-layout | |
84 | + style=" | |
85 | + margin-bottom: -1px; | |
86 | + border: 1px solid #ddd; | |
87 | + margin: 0px;" | |
88 | + > | |
63 | 89 | <v-flex xs6 sm6> |
64 | - <h4 class="right"> | |
90 | + <h4 style="float:right;margin: 4px 0px;"> | |
65 | 91 | <b>Class :</b> |
66 | 92 | </h4> |
67 | 93 | </v-flex> |
68 | 94 | <v-flex sm6 xs6> |
69 | - <h4>{{ markData[0].classId.classNum }}</h4> | |
95 | + <h4 style="float:left;margin: 4px 0px;">{{ markData[0].classId.classNum }}</h4> | |
70 | 96 | </v-flex> |
71 | 97 | </v-layout> |
72 | - <v-layout class="pa-2"> | |
98 | + <v-layout | |
99 | + style=" | |
100 | + margin-bottom: -1px; | |
101 | + border: 1px solid #ddd; | |
102 | + margin: 0px;" | |
103 | + > | |
73 | 104 | <v-flex xs6 sm6> |
74 | - <h4 class="right"> | |
105 | + <h4 style="float:right;margin: 4px 0px;"> | |
75 | 106 | <b>Section :</b> |
76 | 107 | </h4> |
77 | 108 | </v-flex> |
78 | 109 | <v-flex sm6 xs6> |
79 | - <h4>{{ markData[0].sectionId.name }}</h4> | |
110 | + <h4 style="float:left;margin: 4px 0px;">{{ markData[0].sectionId.name }}</h4> | |
80 | 111 | </v-flex> |
81 | 112 | </v-layout> |
82 | - <v-layout class="pa-2"> | |
113 | + <v-layout | |
114 | + style=" | |
115 | + margin-bottom: -1px; | |
116 | + border: 1px solid #ddd; | |
117 | + margin: 0px;" | |
118 | + > | |
83 | 119 | <v-flex xs6 sm6> |
84 | - <h4 class="right"> | |
120 | + <h4 style="float:right;margin: 4px 0px;"> | |
85 | 121 | <b>Roll No :</b> |
86 | 122 | </h4> |
87 | 123 | </v-flex> |
88 | 124 | <v-flex sm6 xs6> |
89 | - <h4>{{ markData[0].studentId.rollNo }}</h4> | |
125 | + <h4 style="float:left;margin: 4px 0px;">{{ markData[0].studentId.rollNo }}</h4> | |
90 | 126 | </v-flex> |
91 | 127 | </v-layout> |
92 | 128 | <!-- <p |
... | ... | @@ -103,9 +139,18 @@ |
103 | 139 | >Roll No : {{ markData[0].studentId.rollNo }}</p>--> |
104 | 140 | </v-card> |
105 | 141 | </v-flex> |
106 | - <v-flex xs12 sm12 md8 v-show="showMark"> | |
107 | - <v-card> | |
108 | - <div style="overflow-x:auto;"> | |
142 | + <v-flex xs12 sm12 md9 v-show="showMark"> | |
143 | + <v-card | |
144 | + style=" margin:auto 14px; | |
145 | + padding:20px 0px; | |
146 | + background-color: #fff; | |
147 | + border: 1px solid lightgrey; | |
148 | + color: rgba(0,0,0,0.87); | |
149 | + border: 1px solid rgb(226, 231, 235); | |
150 | + -webkit-box-shadow:inherit !important; | |
151 | + box-shadow: inherit !important;" | |
152 | + > | |
153 | + <div> | |
109 | 154 | <table |
110 | 155 | v-for="(value, id) in filterData" |
111 | 156 | :key="id" |
... | ... | @@ -123,7 +168,6 @@ |
123 | 168 | border-top: inherit; |
124 | 169 | padding:14px;" |
125 | 170 | >{{value[0].examId.examName}}</td> |
126 | - <!-- </tr> --> | |
127 | 171 | <tr style="border: 1px solid lightgrey !important;"> |
128 | 172 | <td |
129 | 173 | rowspan="2" | ... | ... |
src/pages/Report/progressCardReport.vue
... | ... | @@ -81,7 +81,7 @@ |
81 | 81 | <v-flex xs12> |
82 | 82 | <v-card class="transparent elevation-0"> |
83 | 83 | <v-container grid-list-md class="report"> |
84 | - <v-flex xs12 sm12 id="printMe"> | |
84 | + <v-flex xs12 sm12> | |
85 | 85 | <v-layout wrap> |
86 | 86 | <!-- ****** TABLE DATA MARK ****** --> |
87 | 87 | <v-flex xs12 sm12 md12> |
... | ... | @@ -93,220 +93,281 @@ |
93 | 93 | </v-btn> |
94 | 94 | </v-flex> |
95 | 95 | </v-layout> |
96 | - <v-flex xs12 v-for="(value, id, Index) in filterData" :key="Index" flat> | |
97 | - <!-- {{value}}---{{id}}---{{index}} --> | |
98 | - <v-card | |
99 | - class="ma-3" | |
100 | - style="border: 1px solid lightgrey;margin-bottom:14px;padding:20px" | |
101 | - > | |
102 | - <v-layout> | |
103 | - <v-flex xs12 sm12 md12> | |
104 | - <div> | |
105 | - <div class="school-logo"> | |
106 | - <v-avatar> | |
107 | - <img :src="userData.schoolLogoUrl" v-if="userData.schoolLogoUrl" /> | |
108 | - <img | |
109 | - src="/static/schoolIcons/INTRACK_White.png" | |
110 | - v-else-if="!userData.schoolLogoUrl" | |
111 | - /> | |
112 | - </v-avatar> | |
113 | - </div> | |
114 | - <div class="school-name"> | |
115 | - <h2>{{ userData.name }}</h2> | |
116 | - </div> | |
117 | - </div> | |
118 | - <hr | |
119 | - style="border:1px solid #ddd; | |
120 | - overflow: hidden; | |
121 | - vertical-align: middle; | |
122 | - margin: 10px; 0px;" | |
123 | - /> | |
124 | - <!-- Profile School --> | |
125 | - <div class="school-info"> | |
126 | - <v-layout> | |
127 | - <v-flex xs5 class="pl-3"> | |
128 | - <p style="font-size:20px;">{{ userData.name }}</p> | |
129 | - <p | |
130 | - style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;" | |
131 | - >{{ userData.address }}</p> | |
132 | - <p | |
133 | - style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;" | |
134 | - >{{ userData.mobile }}</p> | |
135 | - <p | |
136 | - style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;" | |
137 | - >{{ userData.email }}</p> | |
138 | - </v-flex> | |
139 | - <!-- Profile Student Report Card--> | |
140 | - <v-flex xs5> | |
141 | - <div v-for="(studentMark,i,index) in value" :key="index"> | |
142 | - <p | |
143 | - v-if="index == 0" | |
144 | - style="font-size:20px;" | |
145 | - >{{ studentMark[0].studentId.name }}</p> | |
146 | - <p | |
147 | - v-if="index == 0" | |
148 | - style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;" | |
149 | - > | |
150 | - Class : | |
151 | - <b>{{ studentMark[0].classId.classNum }}</b> | |
152 | - </p> | |
153 | - <p | |
154 | - v-if="index == 0" | |
155 | - style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;" | |
156 | - > | |
157 | - Section : | |
158 | - <b>{{ studentMark[0].sectionId.name }}</b> | |
159 | - </p> | |
160 | - <p | |
161 | - v-if="index == 0" | |
162 | - style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;" | |
163 | - > | |
164 | - Roll NO : | |
165 | - <b>{{ studentMark[0].studentId.rollNo }}</b> | |
166 | - </p> | |
167 | - </div> | |
168 | - </v-flex> | |
169 | - <v-flex xs2> | |
170 | - <div v-for="(studentMark,i,index) in value" :key="index"> | |
171 | - <v-avatar size="100" style="padding-top:20px" v-if="index == 0"> | |
172 | - <img | |
173 | - src="/static/icon/user.png" | |
174 | - v-if="!studentMark[0].studentId.profilePicUrl" | |
175 | - /> | |
176 | - <img | |
177 | - :src="studentMark[0].studentId.profilePicUrl" | |
178 | - v-else-if="studentMark[0].studentId.profilePicUrl" | |
179 | - /> | |
180 | - </v-avatar> | |
181 | - </div> | |
182 | - </v-flex> | |
183 | - </v-layout> | |
184 | - </div> | |
185 | - </v-flex> | |
186 | - </v-layout> | |
96 | + <div> | |
97 | + <card class="elevation-0" v-for="(value, id, Index) in filterData" :key="Index"> | |
98 | + <!-- <v-flex xs12 flat> --> | |
99 | + <!-- {{value}}---{{id}}---{{index}} --> | |
187 | 100 | <v-card |
188 | - v-for="studentMarks in value" | |
189 | - :key="studentMarks" | |
190 | - class="my-4 elevation-0" | |
101 | + id="printMe" | |
102 | + class="ma-3" | |
103 | + style=" | |
104 | + border: 1px solid lightgrey; | |
105 | + margin-bottom:14px; | |
106 | + padding:20px" | |
191 | 107 | > |
192 | - <!-- {{studentMark}} --> | |
193 | - <div | |
108 | + <div style="border: 1px solid lightgray;"> | |
109 | + <v-layout> | |
110 | + <v-flex xs12 sm12 md12> | |
111 | + <div | |
112 | + style=" | |
113 | + border-bottom: 1px solid #ddd; | |
114 | + overflow: hidden; | |
115 | + vertical-align: middle; | |
116 | + margin: 10px; | |
117 | + padding-bottom: 10px;" | |
118 | + > | |
119 | + <v-flex xs12 sm12 md12> | |
120 | + <v-layout> | |
121 | + <div class="school-logo"> | |
122 | + <v-avatar> | |
123 | + <img | |
124 | + :src="userData.schoolLogoUrl" | |
125 | + v-if="userData.schoolLogoUrl" | |
126 | + /> | |
127 | + <img | |
128 | + src="/static/schoolIcons/INTRACK_White.png" | |
129 | + v-else-if="!userData.schoolLogoUrl" | |
130 | + /> | |
131 | + </v-avatar> | |
132 | + </div> | |
133 | + <div class="school-name"> | |
134 | + <h2>{{ userData.name }}</h2> | |
135 | + </div> | |
136 | + </v-layout> | |
137 | + </v-flex> | |
138 | + </div> | |
139 | + <!-- Profile School --> | |
140 | + <div class="school-info"> | |
141 | + <v-layout> | |
142 | + <v-flex | |
143 | + xs5 | |
144 | + style="padding: 4px; | |
145 | + padding-left: 16px !important;" | |
146 | + > | |
147 | + <p | |
148 | + style="font-size:20px;margin-bottom: 16px;" | |
149 | + >{{ userData.name }}</p> | |
150 | + <p | |
151 | + style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;" | |
152 | + >{{ userData.address }}</p> | |
153 | + <p | |
154 | + style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;" | |
155 | + >{{ userData.mobile }}</p> | |
156 | + <p | |
157 | + style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;" | |
158 | + >{{ userData.email }}</p> | |
159 | + </v-flex> | |
160 | + <!-- Profile Student Report Card--> | |
161 | + <v-flex xs5> | |
162 | + <div v-for="(studentMark,i,index) in value" :key="index"> | |
163 | + <p | |
164 | + v-if="index == 0" | |
165 | + style="font-size:20px;margin-bottom: 16px;" | |
166 | + >{{ studentMark[0].studentId.name }}</p> | |
167 | + <p | |
168 | + v-if="index == 0" | |
169 | + style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;" | |
170 | + > | |
171 | + Class : | |
172 | + <b>{{ studentMark[0].classId.classNum }}</b> | |
173 | + </p> | |
174 | + <p | |
175 | + v-if="index == 0" | |
176 | + style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;" | |
177 | + > | |
178 | + Section : | |
179 | + <b>{{ studentMark[0].sectionId.name }}</b> | |
180 | + </p> | |
181 | + <p | |
182 | + v-if="index == 0" | |
183 | + style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;" | |
184 | + > | |
185 | + Roll NO : | |
186 | + <b>{{ studentMark[0].studentId.rollNo }}</b> | |
187 | + </p> | |
188 | + </div> | |
189 | + </v-flex> | |
190 | + <v-flex xs2> | |
191 | + <div v-for="(studentMark,i,index) in value" :key="index"> | |
192 | + <v-avatar | |
193 | + size="100" | |
194 | + style="margin-top:16px" | |
195 | + v-if="index == 0" | |
196 | + > | |
197 | + <img | |
198 | + src="/static/icon/user.png" | |
199 | + v-if="!studentMark[0].studentId.profilePicUrl" | |
200 | + /> | |
201 | + <img | |
202 | + :src="studentMark[0].studentId.profilePicUrl" | |
203 | + v-else-if="studentMark[0].studentId.profilePicUrl" | |
204 | + /> | |
205 | + </v-avatar> | |
206 | + </div> | |
207 | + </v-flex> | |
208 | + </v-layout> | |
209 | + </div> | |
210 | + </v-flex> | |
211 | + </v-layout> | |
212 | + <v-card | |
213 | + v-for="studentMarks in value" | |
214 | + :key="studentMarks" | |
215 | + style=" | |
216 | + background-color: #fff; | |
217 | + border-color: #fff; | |
218 | + color: rgba(0,0,0,0.87); | |
219 | + webkit-box-shadow: 0px 0px 0px 0px rgba(0,0,0,0.2), 0px 0px 0px 0px rgba(0,0,0,0.14), 0px 0px 0px 0px rgba(0,0,0,0.12) !important; | |
220 | + box-shadow: 0px 0px 0px 0px rgba(0,0,0,0.2), 0px 0px 0px 0px rgba(0,0,0,0.14), 0px 0px 0px 0px rgba(0,0,0,0.12) !important;" | |
221 | + > | |
222 | + <!-- {{studentMark}} --> | |
223 | + <!-- <div | |
194 | 224 | style="overflow-x:auto; |
195 | 225 | border: 1px solid lightgrey !important;" |
196 | - > | |
197 | - <table | |
198 | - v-for="(studentMark,key) in studentMarks" | |
199 | - :key="key" | |
200 | - class="tableRsponsive feeTypeTable subheading" | |
201 | - style="border: 1px solid black; | |
226 | + >--> | |
227 | + <table | |
228 | + v-for="(studentMark,key) in studentMarks" | |
229 | + :key="key" | |
230 | + class="tableRsponsive feeTypeTable subheading" | |
231 | + style="border: 1px solid black; | |
202 | 232 | border-collapse: collapse;!important |
203 | 233 | table-layout: auto !important; |
204 | 234 | width: 100% !important; |
205 | 235 | overflow: hidden;" |
206 | - > | |
207 | - <thead style="border: 1px solid transparent !important" v-if="key == 0"> | |
208 | - <tr style="border: 1px solid transparent !important"> | |
209 | - <td | |
210 | - colspan="4" | |
211 | - style="text-align: inherit !important; | |
236 | + > | |
237 | + <thead | |
238 | + style="border: 1px solid transparent !important" | |
239 | + v-if="key == 0" | |
240 | + > | |
241 | + <tr style="border: 1px solid transparent !important"> | |
242 | + <td | |
243 | + colspan="4" | |
244 | + style="text-align: inherit !important; | |
212 | 245 | border-right: inherit; |
213 | 246 | border-top: inherit; |
214 | 247 | padding:14px;" |
215 | - >{{studentMark.examId.examName}}</td> | |
216 | - </tr> | |
217 | - <tr style="border: 1px solid lightgrey !important;padding:4px;"> | |
218 | - <td | |
219 | - rowspan="2" | |
220 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
221 | - >Subject</td> | |
222 | - <template> | |
248 | + >{{studentMark.examId.examName}}</td> | |
249 | + </tr> | |
250 | + <tr style="border: 1px solid lightgrey !important;padding:4px;"> | |
251 | + <td | |
252 | + rowspan="2" | |
253 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
254 | + >Subject</td> | |
255 | + <template> | |
256 | + <td | |
257 | + v-for="(studentMarkData,i) in studentMark.studentsMarks" | |
258 | + :key="i" | |
259 | + colspan="2" | |
260 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
261 | + >{{studentMarkData.markDistributionId.distributionType}}</td> | |
262 | + <td | |
263 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
264 | + >Total Marks</td> | |
265 | + </template> | |
266 | + </tr> | |
267 | + <tr style="border: 1px solid lightgrey !important;"> | |
268 | + <template v-for="(exam, ind) in studentMark.studentsMarks"> | |
269 | + <td | |
270 | + :key="ind" | |
271 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
272 | + >Marks</td> | |
273 | + <td | |
274 | + :key="ind" | |
275 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
276 | + >Highest Marks</td> | |
277 | + </template> | |
278 | + </tr> | |
279 | + </thead> | |
280 | + <tbody | |
281 | + style="border: 1px solid lightgrey !important;" | |
282 | + v-if="key == 0" | |
283 | + > | |
284 | + <tr v-for="studentMark in studentMarks" :key="studentMark"> | |
285 | + <td | |
286 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
287 | + >{{studentMark.subjectName}}</td> | |
288 | + <template v-for="(exam, index) in studentMark.studentsMarks"> | |
289 | + <td | |
290 | + :key="index" | |
291 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
292 | + >{{exam.marksScored}}</td> | |
293 | + <td | |
294 | + :key="index" | |
295 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
296 | + >{{exam.markDistributionId.markValue}}</td> | |
297 | + </template> | |
223 | 298 | <td |
224 | - v-for="(studentMarkData,i) in studentMark.studentsMarks" | |
225 | - :key="i" | |
226 | - colspan="2" | |
227 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
228 | - >{{studentMarkData.markDistributionId.distributionType}}</td> | |
299 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
300 | + >{{studentMark.totalMarks}}</td> | |
301 | + </tr> | |
302 | + </tbody> | |
303 | + <tfoot v-if="key == studentMarks.length - 1"> | |
304 | + <tr style="border: 1px solid lightgrey !important;"> | |
229 | 305 | <td |
230 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
306 | + colspan="5" | |
307 | + class="subheding" | |
308 | + style=" | |
309 | + border: 1px solid #e2e7eb; | |
310 | + text-align:center | |
311 | + padding: 6px;" | |
231 | 312 | >Total Marks</td> |
232 | - </template> | |
233 | - </tr> | |
234 | - <tr style="border: 1px solid lightgrey !important;"> | |
235 | - <template v-for="(exam, ind) in studentMark.studentsMarks"> | |
236 | 313 | <td |
237 | - :key="ind" | |
238 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
239 | - >Marks</td> | |
314 | + colspan="7" | |
315 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
316 | + >{{ studentMark.allSubjectTotalMarks }}</td> | |
317 | + </tr> | |
318 | + <tr> | |
319 | + <td | |
320 | + colspan="5" | |
321 | + class="subheding" | |
322 | + style=" | |
323 | + border: 1px solid #e2e7eb; | |
324 | + text-align:center | |
325 | + padding: 6px;" | |
326 | + >Grade</td> | |
327 | + <td | |
328 | + colspan="7" | |
329 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
330 | + >{{ studentMark.grade ? studentMark.grade : "-" }}</td> | |
331 | + </tr> | |
332 | + <tr> | |
333 | + <td | |
334 | + colspan="5" | |
335 | + style=" | |
336 | + border: 1px solid #e2e7eb; | |
337 | + text-align:center | |
338 | + padding: 6px;" | |
339 | + class="subheding" | |
340 | + >Average Mark</td> | |
240 | 341 | <td |
241 | - :key="ind" | |
242 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
243 | - >Highest Marks</td> | |
244 | - </template> | |
245 | - </tr> | |
246 | - </thead> | |
247 | - <tbody style="border: 1px solid lightgrey !important;" v-if="key == 0"> | |
248 | - <tr v-for="studentMark in studentMarks" :key="studentMark"> | |
249 | - <td | |
250 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
251 | - >{{studentMark.subjectName}}</td> | |
252 | - <template v-for="(exam, index) in studentMark.studentsMarks"> | |
342 | + colspan="7" | |
343 | + style="border: 1px solid lightgrey !important;padding: 6px;" | |
344 | + >-</td> | |
345 | + </tr> | |
346 | + <tr> | |
253 | 347 | <td |
254 | - :key="index" | |
255 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
256 | - >{{exam.marksScored}}</td> | |
348 | + colspan="5" | |
349 | + style=" | |
350 | + border: 1px solid #e2e7eb; | |
351 | + text-align:center | |
352 | + padding: 6px; !important; | |
353 | + font-size: 16px !important;" | |
354 | + class="subheding" | |
355 | + >GPA</td> | |
257 | 356 | <td |
258 | - :key="index" | |
259 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
260 | - >{{exam.markDistributionId.markValue}}</td> | |
261 | - </template> | |
262 | - <td | |
263 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
264 | - >{{studentMark.totalMarks}}</td> | |
265 | - </tr> | |
266 | - </tbody> | |
267 | - <tfoot v-if="key == studentMarks.length - 1"> | |
268 | - <tr style="border: 1px solid lightgrey !important;"> | |
269 | - <td | |
270 | - colspan="5" | |
271 | - style="text-align:center" | |
272 | - class="subheding" | |
273 | - >Total Marks</td> | |
274 | - <td | |
275 | - colspan="7" | |
276 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
277 | - >{{ studentMark.allSubjectTotalMarks }}</td> | |
278 | - </tr> | |
279 | - <tr> | |
280 | - <td colspan="5" style="text-align:center" class="subheding">Grade</td> | |
281 | - <td | |
282 | - colspan="7" | |
283 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
284 | - >{{ studentMark.grade }}</td> | |
285 | - </tr> | |
286 | - <tr> | |
287 | - <td | |
288 | - colspan="5" | |
289 | - style="text-align:center" | |
290 | - class="subheding" | |
291 | - >Average Mark</td> | |
292 | - <td | |
293 | - colspan="7" | |
294 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
295 | - ></td> | |
296 | - </tr> | |
297 | - <tr> | |
298 | - <td colspan="5" style="text-align:center" class="subheding">GPA</td> | |
299 | - <td | |
300 | - colspan="7" | |
301 | - style="border: 1px solid lightgrey !important;padding: 10px;" | |
302 | - ></td> | |
303 | - </tr> | |
304 | - </tfoot> | |
305 | - </table> | |
357 | + colspan="7" | |
358 | + style="border: 1px solid lightgrey !important;padding: 6px !important;font-size: 16px !important;" | |
359 | + >-</td> | |
360 | + </tr> | |
361 | + </tfoot> | |
362 | + </table> | |
363 | + <!-- </div> --> | |
364 | + </v-card> | |
306 | 365 | </div> |
307 | 366 | </v-card> |
308 | - </v-card> | |
309 | - </v-flex> | |
367 | + <!-- </v-flex> --> | |
368 | + </card> | |
369 | + </div> | |
370 | + <p style="page-break-after: always;"> </p> | |
310 | 371 | </v-flex> |
311 | 372 | </v-layout> |
312 | 373 | </v-flex> |
... | ... | @@ -543,7 +604,7 @@ table { |
543 | 604 | th, |
544 | 605 | td { |
545 | 606 | border: 1px solid #e2e7eb; |
546 | - padding: 10px; | |
607 | + padding: 6px; | |
547 | 608 | text-align: center; |
548 | 609 | } |
549 | 610 | table.feeTypeTable { | ... | ... |