viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit f84ff8f5ab33951f1a87eb453bfc84b26ac9e777

Authored by Jatinder Singh
1 parent defcc5da3a
Exists in master and in 3 other branches amber-development, development, ui-design

report page changes

Showing 8 changed files with 83 additions and 41 deletions   Show diff stats
src/components/report/generatereport.vue
Diff comments   View file @f84ff8f
... ... @@ -0,0 +1,10 @@
  1 +<template>
  2 +<h5 id="report"><b>Select month to generate report</b></h5>
  3 +</template>
  4 +<style>
  5 +#report{
  6 + position: absolute;
  7 + top: 275px;
  8 + left:230px
  9 +}
  10 +</style>
0 11 \ No newline at end of file
... ...
src/components/report/ninemonth.vue
Diff comments   View file @f84ff8f
... ... @@ -0,0 +1,5 @@
  1 +<template>
  2 +
  3 +<h3> nine month report</h3>
  4 +
  5 +</template>
0 6 \ No newline at end of file
... ...
src/components/report/onemonth.vue
Diff comments   View file @f84ff8f
... ... @@ -0,0 +1,3 @@
  1 +<template>
  2 +<h3> first month report</h3>
  3 +</template>
0 4 \ No newline at end of file
... ...
src/components/report/sixmonth.vue
Diff comments   View file @f84ff8f
... ... @@ -0,0 +1,5 @@
  1 +<template>
  2 +
  3 +<h3> six month report</h3>
  4 +
  5 +</template>
0 6 \ No newline at end of file
... ...
src/components/report/threemonth.vue
Diff comments   View file @f84ff8f
... ... @@ -0,0 +1,4 @@
  1 +<template>
  2 +
  3 +<h3> three month report</h3>
  4 +</template>
0 5 \ No newline at end of file
... ...
src/pages/Dashboard.vue
Diff comments   View file @f84ff8f
... ... @@ -141,30 +141,22 @@
141 141 <h4><b> Report </b> </h4>
142 142 <h5 id="name"><b>Patient Name:</b> {{ editedItem.Name+' '+editedItem.LName }}</h5>
143 143 <h5 id="m">Select Month:</h5>
144   - <v-btn flat id="G">Generate</v-btn>
  144 + <v-btn color="grey darken-3" id="G" v-on:click="component='report-generate'">Generate</v-btn>
145 145 <v-spacer></v-spacer>
146 146 <v-icon id="icon" @click="close2">close</v-icon>
  147 +
147 148 <span id="bt">
148   - <v-btn flat>1 month</v-btn>
149   -
150   - <v-btn flat>3 Month</v-btn>
151   - <v-btn flat>6 Month</v-btn>
152   - <v-btn flat>9 Month</v-btn>
153   - <!-- <v-flex xs10>
154   - <v-tabs
155   - slider-color="transparent"
156   - >
157   - <v-tab ripple>1 Month</v-tab>
158   - <v-tab ripple>3 Month</v-tab>
159   - <v-tab ripple>6 Month</v-tab>
160   - <v-tab ripple>9 Month</v-tab> -->
  149 +
  150 + <v-btn color="grey darken-2" v-on:click="component='one-month'" flat>1 month</v-btn>
  151 + <v-btn color="grey darken-2" v-on:click="component='three-month'" flat>3 Month</v-btn>
  152 + <v-btn color="grey darken-2" v-on:click="component='six-month'" flat>6 Month</v-btn>
  153 + <v-btn color="grey darken-2" v-on:click="component='nine-month'" flat>9 Month</v-btn>
161 154 <img id="e" @click="mail" src="/static/icon/email1.png"/>
162 155 <img id="d" @click="download" src="/static/icon/download1.png"/>
163   - <!-- </v-tabs></v-flex> -->
164 156 </span>
165   - <v-card-text>
166   - <h5 style="position: absolute; top:275px; left:230px"><b>Select month to generate report</b></h5>
167   - </v-card-text>
  157 + <component v-bind:is="component"></component>
  158 +
  159 +
168 160 </div>
169 161 </v-card>
170 162 </v-dialog>
... ... @@ -193,7 +185,6 @@
193 185 </template>
194 186  
195 187 </v-data-table>
196   -
197 188 </v-tab-item>
198 189 <v-tab-item>
199 190 <v-flex xs12 sm6 offset-sm3>
... ... @@ -276,9 +267,22 @@
276 267 </template>
277 268  
278 269 <script>
  270 +import onemonth from '@/components/report/onemonth.vue';
  271 +import threemonth from '@/components/report/threemonth.vue';
  272 +import sixmonth from '@/components/report/sixmonth.vue';
  273 +import ninemonth from '@/components/report/ninemonth.vue';
  274 +import generatereport from '@/components/report/generatereport.vue';
279 275 import axios from 'axios';
280 276 export default {
  277 + components: {
  278 + 'one-month': onemonth,
  279 + 'three-month': threemonth,
  280 + 'six-month': sixmonth,
  281 + 'nine-month': ninemonth,
  282 + 'report-generate': generatereport,
  283 + },
281 284 data: () => ({
  285 + component: 'report-generate',
282 286 No: '',
283 287 Name: '',
284 288 LName: '',
... ... @@ -482,6 +486,7 @@ h4 {
482 486 #G {
483 487 position: absolute;
484 488 top: 38px;
  489 + color: white;
485 490 }
486 491 #bt {
487 492 position: relative;
... ...
src/pages/Login.vue
Diff comments   View file @f84ff8f
... ... @@ -42,8 +42,10 @@
42 42 </v-form></v-flex>
43 43 </v-card-text>
44 44 <v-flex xs12 sm8 md8 lg8 offset-xs2>
45   - <v-checkbox :label="`Remember me`"
46   - v-model="remember"></v-checkbox>
  45 + <v-checkbox
  46 + :label="`Remember me`"
  47 + v-model="remember"
  48 + ></v-checkbox>
47 49 <h5 id="fp"> <router-link to="/forgetpassword">Forget Password</router-link></h5>
48 50 </v-flex>
49 51  
... ... @@ -96,6 +98,16 @@ export default {
96 98 this.$router.push('/dashboard');
97 99 }, 1000);
98 100 }
  101 + // created () {
  102 + // axios.get(`http://jsonplaceholder.typicode.com/posts`)
  103 + // .then(response => {
  104 +
  105 + // this.posts = response.data;
  106 + // })
  107 + // .catch(e => {
  108 + // this.errors.push(e);
  109 + // });
  110 + // }
99 111 }
100 112 };
101 113 </script>
... ...
src/pages/questions.vue
Diff comments   View file @f84ff8f
... ... @@ -7,20 +7,18 @@
7 7 <h3 style="position:relative; left:px; top:-5px;"><b>Forum Questions</b></h3>
8 8 <h5 style="position:relative; left:40px; top:-15px;">Select Category</h5>
9 9 <span style="position:relative; left:-95px; top:10px;">
10   - <v-btn color="black" flat>Suggestion</v-btn>
11   - <v-btn color="black" flat>Sex</v-btn>
12   - <v-btn color="black" flat>Health</v-btn>
13   - <v-btn color="black" flat>Skin & Beauty</v-btn>
14   - <v-btn color="black" flat>Diet & Ex</v-btn>
15   -
  10 + <v-btn color="grey darken-2" flat>Suggestion</v-btn>
  11 + <v-btn color="grey darken-2" flat>Sex</v-btn>
  12 + <v-btn color="grey darken-2" flat>Health</v-btn>
  13 + <v-btn color="grey darken-2" flat>Skin & Beauty</v-btn>
  14 + <v-btn color="grey darken-2" flat>Diet & Ex</v-btn>
16 15 </span>
17 16  
18 17 </v-card-title>
19 18  
20 19 <v-spacer></v-spacer>
21 20 <v-dialog v-model="dialog" max-width="800px">
22   -
23   - <!-- <v-btn style="position:relative; top:-10px;" slot="activator" flat class="mb-2">Add New Question<v-icon>add</v-icon></v-btn> -->
  21 +
24 22 <v-card>
25 23 <v-card-title>
26 24 <span class="headline">{{ formTitle }}</span>
... ... @@ -34,11 +32,11 @@
34 32 <p><b>Ana Suggestion:</b> Select Suggestion</p></span>
35 33 <h5>Select Category:</h5>
36 34 <span>
37   - <v-btn color="black" flat>Suggestion</v-btn>
38   - <v-btn color="black" flat>Sex</v-btn>
39   - <v-btn color="black" flat>Health</v-btn>
40   - <v-btn color="black" flat>Skin & Beauty</v-btn>
41   - <v-btn color="black" flat>Diet & Ex</v-btn>
  35 + <v-btn color="grey darken-2" flat>Suggestion</v-btn>
  36 + <v-btn color="grey darken-2" flat>Sex</v-btn>
  37 + <v-btn color="grey darken-2" flat>Health</v-btn>
  38 + <v-btn color="grey darken-2" flat>Skin & Beauty</v-btn>
  39 + <v-btn color="grey darken-2" flat>Diet & Ex</v-btn>
42 40 </span>
43 41 </v-card-text>
44 42 </v-card>
... ... @@ -117,9 +115,9 @@
117 115 </tr>
118 116 </template>
119 117 </v-data-table>
120   -
121 118 </v-card>
122 119 </v-flex>
  120 +
123 121 </v-container>
124 122 </template>
125 123 <script>
... ... @@ -129,6 +127,8 @@ export default {
129 127 AddQuestioncredentials: {},
130 128 dialog: false,
131 129 dialog1: false,
  130 + isActive: true,
  131 + newActive: false,
132 132 pagination: {
133 133 rowsPerPage: 10,
134 134 },
... ... @@ -228,9 +228,9 @@ export default {
228 228 this.close1();
229 229 }
230 230 },
231   - switchComponent (comp) {
232   - this.$emit('switchComp', comp);
233   - }
  231 + // switchComponent (comp) {
  232 + // this.$emit('switchComp', comp);
  233 + // }
234 234 };
235 235 </script>
236 236 <style>
... ... @@ -238,8 +238,6 @@ export default {
238 238 border: 1px solid #dddddd;
239 239 text-align: left;
240 240 padding: 8px;
241   - max-width: 300px;
  241 +
242 242 }
243   -
244   -
245 243 </style>
... ...