viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 59793b95a8438718071e2990c8a28cef8e3b8aed

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

complete design and functionality of paymentHistory and e-book

Showing 2 changed files with 28 additions and 29 deletions   Show diff stats
src/pages/Account/paymentHistory.vue
Diff comments   View file @59793b9
... ... @@ -121,6 +121,14 @@
121 121 <div class="loader" v-if="showLoader">
122 122 <v-progress-circular indeterminate color="white"></v-progress-circular>
123 123 </div>
  124 + <v-snackbar
  125 + :timeout="timeout"
  126 + :top="y === 'top'"
  127 + :right="x === 'right'"
  128 + :vertical="mode === 'vertical'"
  129 + v-model="snackbar"
  130 + :color="color"
  131 + >{{ text }}</v-snackbar>
124 132 </v-container>
125 133 </template>
126 134  
... ... @@ -182,7 +190,14 @@ export default {
182 190 paymentHistory: [],
183 191 addPaymentHistoryDialog: "",
184 192 editPaymentDialog: false,
185   - editedItem: {}
  193 + editedItem: {},
  194 + y: "top",
  195 + x: "right",
  196 + mode: "",
  197 + timeout: 5000,
  198 + text: "",
  199 + color: "",
  200 + snackbar: false
186 201 }),
187 202 methods: {
188 203 editItem(item) {
... ... @@ -270,8 +285,9 @@ export default {
270 285 this.editPaymentDialog = false;
271 286 })
272 287 .catch(error => {
273   - console.log("error", error);
  288 + console.log("error", error.response);
274 289 this.snackbar = true;
  290 + this.text = error.response.data.message;
275 291 this.color = "red";
276 292 });
277 293 },
... ... @@ -283,22 +299,7 @@ export default {
283 299 this.showSearch = false;
284 300 this.show = true;
285 301 this.search = "";
286   - },
287   - // fixedPaidAmount(paidAmount) {
288   - // console.log("paidAmount", paidAmount);
289   - // console.log(
290   - // "this.editedItem.feeType.subTotal",
291   - // this.editedItem.feeType.subTotal
292   - // );
293   - // if (paidAmount > this.editedItem.feeType.subTotal) {
294   - // console.log(
295   - // "------------finaly------------",
296   - // this.editedItem.feeType.subTotal
297   - // );
298   - // this.editedItem.paidAmount = this.editedItem.feeType.subTotal;
299   - // console.log("finally----paidamount", this.editedItem.paidAmount);
300   - // }
301   - // }
  302 + }
302 303 },
303 304 mounted() {
304 305 this.token = this.$store.state.token;
... ...
src/pages/Library/eBook.vue
Diff comments   View file @59793b9
... ... @@ -137,25 +137,25 @@
137 137  
138 138 <!-- ****** PROFILE VIEW ALL NEWS DEATILS ****** -->
139 139  
140   - <v-dialog v-model="viewEbookDialog" max-width="800px" scrollable>
  140 + <v-dialog v-model="viewEbookDialog" max-width="600px" scrollable>
141 141 <v-card flat class="card-style pa-3" dark>
142 142 <v-layout>
143 143 <v-flex xs12>
144   - <label class="title text-xs-center">View E-book Details</label>
  144 + <label class="title text-xs-center">View E-book</label>
145 145 <v-icon size="24" class="right" @click="viewEbookDialog = false">cancel</v-icon>
146 146 </v-flex>
147 147 </v-layout>
148 148 <v-layout>
149 149 <v-flex align-center justify-center layout text-xs-center class="mt-3">
150 150 <v-avatar size="100px">
151   - <img src="/static/icon/user.png" v-if="!editedItem.fileUrl" />
152   - <img :src="editedItem.fileUrl" v-else-if="editedItem.fileUrl" />
  151 + <img src="/static/icon/user.png" v-if="!editedItem.coverPhotoUrl" />
  152 + <img :src="editedItem.coverPhotoUrl" v-else-if="editedItem.coverPhotoUrl" />
153 153 </v-avatar>
154 154 </v-flex>
155 155 </v-layout>
156 156 <v-container grid-list-md>
157 157 <v-layout wrap>
158   - <v-flex xs12 sm5>
  158 + <v-flex xs12 sm12>
159 159 <v-layout>
160 160 <v-flex xs6 sm6>
161 161 <h5 class="right my-1">
... ... @@ -167,21 +167,20 @@
167 167 </v-flex>
168 168 </v-layout>
169 169 </v-flex>
170   - <v-flex xs12 sm7>
  170 + <v-flex xs12 sm12>
171 171 <v-layout>
172   - <v-flex xs6 sm4>
  172 + <v-flex xs6 sm6>
173 173 <h5 class="right my-1">
174 174 <b>Author:</b>
175 175 </h5>
176 176 </v-flex>
177   - <v-flex sm8 xs6>
  177 + <v-flex sm6 xs6>
178 178 <h5 class="my-1 left">{{ editedItem.author }}</h5>
179 179 </v-flex>
180 180 </v-layout>
181 181 </v-flex>
182 182 </v-layout>
183   - <v-layout wrap>
184   - <v-flex xs12 sm5>
  183 + <v-flex xs12 sm12>
185 184 <v-layout>
186 185 <v-flex xs6 sm6>
187 186 <h5 class="right my-1">
... ... @@ -193,7 +192,6 @@
193 192 </v-flex>
194 193 </v-layout>
195 194 </v-flex>
196   - </v-layout>
197 195 </v-container>
198 196 </v-card>
199 197 </v-dialog>
... ...