viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 819c223ec08cc985738f4d27e53b5664a7b68dfa

Authored by Shikha Mishra
1 parent 8deade1932
Exists in master and in 3 other branches amber-development, development, ui-design

improve school and persons logo and details

Showing 3 changed files with 32 additions and 26 deletions   Show diff stats
src/pages/Mark/viewMark.vue
Diff comments   View file @819c223
... ... @@ -23,7 +23,7 @@
23 23 <v-layout wrap>
24 24 <!-- ****** TABLE DATA MARK ****** -->
25 25 <v-flex xs12 sm12 md12>
26   - <v-card
  26 + <v-card
27 27 v-for="(value, id, index) in filterData"
28 28 :key="index"
29 29 flat
... ... @@ -36,33 +36,24 @@
36 36 <p>{{ userData.address }}</p>
37 37 </v-flex>
38 38 <v-flex xs12 sm12 md12 class="text-xs-center">
39   - <v-avatar size="100">
40   - <img
41   - :src="value[0].studentId.profilePicUrl"
42   - v-if="value[0].studentId.profilePicUrl"
43   - width="100px"
44   - />
45   - <img
46   - src="/static/icon/user.png"
47   - v-else-if="!value[0].studentId.profilePicUrl"
48   - width="100px"
49   - />
  39 + <v-avatar size="80px">
  40 + <img src="/static/icon/user.png" v-if="!value[0].studentId.profilePicUrl" />
  41 + <img :src="value[0].studentId.profilePicUrl" v-else-if="value[0].studentId.profilePicUrl" />
50 42 </v-avatar>
51 43 <p
52 44 style="font-size:20px;margin:0px;margin-bottom:4px;"
53 45 >{{ value[0].studentId.name }}</p>
54 46 <p
55 47 style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
56   - >Class : {{ value[0].classId.classNum }}</p>
  48 + > Class : {{ value[0].classId.classNum }}</p>
57 49 <p
58 50 style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
59   - >Roll NO : {{ value[0].studentId.rollNo }}</p>
  51 + > Section : {{ value[0].sectionId.name }}</p>
60 52 <p
61 53 style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
62   - >Section : {{ value[0].sectionId.name }}</p>
  54 + > Roll No : {{ value[0].studentId.rollNo }}</p>
63 55 </v-flex>
64 56 </v-layout>
65   - <v-card-title class="subheading">{{value[0].examId.examName}}</v-card-title>
66 57 <table
67 58 class="mb-5 tableRsponsive feeTypeTable"
68 59 style="border: 1px solid lightgrey;
... ...
src/pages/Report/progressCardReport.vue
Diff comments   View file @819c223
... ... @@ -117,21 +117,20 @@
117 117 >Class : {{ value[0].classId.classNum }}</p>
118 118 <p
119 119 style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
120   - >Roll NO : {{ value[0].studentId.rollNo }}</p>
  120 + >Section : {{ value[0].sectionId.name }}</p>
121 121 <p
122 122 style="font-size: 15px;color: #707478;margin:0px;margin-bottom:4px;"
123   - >Section : {{ value[0].sectionId.name }}</p>
  123 + >Roll NO : {{ value[0].studentId.rollNo }}</p>
124 124 </v-flex>
125 125 </v-layout>
126   - <v-card-title class="subheading">{{value[0].examId.examName}}</v-card-title>
  126 + <!-- <v-card-title class="subheading">{{value[0].examId.examName}}</v-card-title> -->
127 127 <table
128 128 class="mb-5 tableRsponsive feeTypeTable"
129 129 style="border: 1px solid lightgrey;
130 130 border-collapse: collapse;!important
131 131 table-layout: auto !important;
132 132 width: 100% !important;
133   - overflow: hidden;
134   - display: block;"
  133 + overflow: hidden;"
135 134 >
136 135 <thead style="border: 1px solid lightgrey !important;">
137 136 <tr style="border: 1px solid lightgrey !important;padding:4px;">
... ... @@ -144,13 +143,13 @@
144 143 colspan="2"
145 144 style="border: 1px solid lightgrey !important;padding: 10px;"
146 145 >{{ exam.markDistributionId.distributionType }}</td>
147   - <template v-for="studentData in value">
  146 + <!-- <template v-for="studentData in value">
148 147 <td
149 148 colspan="2"
150 149 v-for="studentMark in studentData.studentsMarks"
151 150 >{{ studentMark.markDistributionId.distributionType }}</td>
152   - </template>
153   - <td>{{value[0].studentsMarks[1].markDistributionId.distributionType}}</td>
  151 + </template> -->
  152 + <!-- <td>{{value[0].studentsMarks[1].markDistributionId.distributionType}}</td> -->
154 153  
155 154 <td style="border: 1px solid lightgrey !important;padding: 10px;">Total</td>
156 155 </tr>
... ...
src/pages/Report/studentReport.vue
Diff comments   View file @819c223
... ... @@ -197,7 +197,23 @@
197 197 <p class="title">{{ userData.name }}</p>
198 198 <p>{{ userData.address }}</p>
199 199 </v-flex>
200   - <v-flex xs12 sm12 md12 class="text-xs-center">
  200 + <v-flex xs12 sm12 md12 class="text-xs-center" v-for="(studentReport,i) in getStudentsReportList" :key="i">
  201 + <v-avatar>
  202 + <img :src="studentReport.profilePicUrl" v-if="studentReport.profilePicUrl" />
  203 + <img src="/static/icon/user.png" v-else-if="!studentReport.profilePicUrl" />
  204 + </v-avatar>
  205 + <p
  206 + style="font-size:20px;margin:0px;margin-bottom:4px;"
  207 + >{{ studentReport.name }}</p>
  208 + <p
  209 + style="font-size:20px;color: #707478;margin:0px;margin-bottom:4px;"
  210 + > Class : {{ studentReport.classId.classNum }}</p>
  211 + <p
  212 + style="font-size:20px;color: #707478;margin:0px;margin-bottom:4px;"
  213 + > Section : {{ studentReport.sectionId.name }}</p>
  214 + <p
  215 + style="font-size:20px;color: #707478;margin:0px;margin-bottom:4px;"
  216 + > RollNo : {{ studentReport.rollNo }}</p>
201 217 </v-flex>
202 218 </v-layout>
203 219 <v-data-table
... ... @@ -596,4 +612,4 @@ export default {
596 612 .activebtn {
597 613 color: black !important;
598 614 }
599   -</style>s
600 615 \ No newline at end of file
  616 +</style>
601 617 \ No newline at end of file
... ...