viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 664cc2c52747fc2f6c69a2cf3760a80b67fbe605

Authored by Neeraj Sharma
1 parent 05746bfaec
Exists in master and in 3 other branches amber-development, development, ui-design

test progress card

Showing 1 changed file with 63 additions and 45 deletions   Show diff stats
src/pages/Report/progressCardReport.vue
Diff comments   View file @664cc2c
... ... @@ -115,7 +115,7 @@
115 115 <div style="border: 1px solid lightgray;">
116 116 <v-layout>
117 117 <v-flex xs12 sm12 md12>
118   - <!-- <div
  118 + <div
119 119 style="
120 120 border-bottom: 1px solid #ddd;
121 121 overflow: hidden;
... ... @@ -123,52 +123,62 @@
123 123 margin: 10px;
124 124 padding-bottom: 0px;"
125 125 >
126   - <v-flex xs12 sm12 md12>
127   - <v-layout>
128   - <div class="school-logo">
129   - <img
130   - :src="userData.schoolLogoUrl"
131   - v-if="userData.schoolLogoUrl"
132   - style="width:40px !important;height:40px !important;"
133   - />
134   - <img
135   - src="/static/schoolIcons/INTRACK_White.png"
136   - v-else-if="!userData.schoolLogoUrl"
137   - style="width:40px !important;height:40px !important;"
138   - />
139   - </div>
140   - <div class="school-name">
141   - <h3>{{ userData.name }}</h3>
142   - </div>
143   - </v-layout>
144   - </v-flex>
145   - </div>-->
  126 + <!-- <v-flex xs12 sm12 md12> -->
  127 + <v-layout>
  128 + <div class="school-logo">
  129 + <img
  130 + :src="userData.schoolLogoUrl"
  131 + v-if="userData.schoolLogoUrl"
  132 + style="width:40px !important;height:40px !important; float: left;"
  133 + />
  134 + <img
  135 + src="/static/schoolIcons/INTRACK_White.png"
  136 + v-else-if="!userData.schoolLogoUrl"
  137 + style="width:40px !important;height:40px !important; float: left;"
  138 + />
  139 + </div>
  140 + <div class="school-name">
  141 + <h3>{{ userData.name }}</h3>
  142 + </div>
  143 + </v-layout>
  144 + <!-- </v-flex> -->
  145 + </div>
146 146 <!-- Profile School -->
147 147 <v-flex xs12 sm12 md12 lg12 style="margin:0px 0px; ">
148 148 <v-layout>
149   - <v-flex
150   - xs5
151   - sm5
152   - md5
153   - lg5
154   - style="padding: 4px;
155   - padding-left: 16px !important;"
  149 + <div
  150 + style="flex-basis: 40%;
  151 + -webkit-box-flex: 0;
  152 + -ms-flex-positive: 0;
  153 + flex-grow: 0;
  154 + max-width: 40%;"
156 155 >
157   - <p
158   - style="font-size:20px;margin-bottom: 0px;"
159   - >{{ userData.name }}</p>
160   - <p
161   - style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;"
162   - >{{ userData.address }}</p>
163   - <p
164   - style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;"
165   - >Phone : {{ userData.mobile }}</p>
166   - <p
167   - style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;"
168   - >Email : {{ userData.email }}</p>
169   - </v-flex>
  156 + <div
  157 + style="padding: 4px;
  158 + padding-left: 16px !important;"
  159 + >
  160 + <p
  161 + style="font-size:20px;margin-bottom: 0px;"
  162 + >{{ userData.name }}</p>
  163 + <p
  164 + style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;"
  165 + >{{ userData.address }}</p>
  166 + <p
  167 + style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;"
  168 + >Phone : {{ userData.mobile }}</p>
  169 + <p
  170 + style="font-size: 15px;color: #707478;margin:0px;margin-bottom:8px;"
  171 + >Email : {{ userData.email }}</p>
  172 + </div>
  173 + </div>
170 174 <!-- Profile Student Report Card-->
171   - <v-flex xs5 sm5 md5 lg5>
  175 + <div
  176 + style="flex-basis: 40%;
  177 + -webkit-box-flex: 0;
  178 + -ms-flex-positive: 0;
  179 + flex-grow: 0;
  180 + max-width: 40%;"
  181 + >
172 182 <div v-for="(studentMark,i,index) in value" :key="index">
173 183 <p
174 184 v-if="index == 0"
... ... @@ -196,8 +206,16 @@
196 206 <b>{{ studentMark[0].studentId.rollNo }}</b>
197 207 </p>
198 208 </div>
199   - </v-flex>
200   - <v-flex xs2 sm2 md2 lg2>
  209 + </div>
  210 + <div
  211 + style="
  212 + -ms-flex-preferred-size: 20%;
  213 + flex-basis: 20%;
  214 + -webkit-box-flex: 0;
  215 + -ms-flex-positive: 0;
  216 + flex-grow: 0;
  217 + max-width: 20%;"
  218 + >
201 219 <div v-for="(studentMark,i,index) in value" :key="index">
202 220 <div
203 221 style="padding-top:16px"
... ... @@ -216,7 +234,7 @@
216 234 />
217 235 </div>
218 236 </div>
219   - </v-flex>
  237 + </div>
220 238 </v-layout>
221 239 </v-flex>
222 240 </v-flex>
... ...