diff --git a/src/routes/panel/dashboard/app/app.component.html b/src/routes/panel/dashboard/app/app.component.html
index 71f9eb1..35e9113 100644
--- a/src/routes/panel/dashboard/app/app.component.html
+++ b/src/routes/panel/dashboard/app/app.component.html
@@ -1,26 +1,4 @@
-
-
- انتخاب مرکز / دانشگاه
-
- تمامی مراکز
-
- تمامی مراکز {{ group.name }}
-
- {{ university.viewValue }}
-
-
-
-
-
+
@@ -32,6 +10,30 @@
فیلتر ها و جستجو
+
+
+ انتخاب مرکز / دانشگاه
+
+ تمامی مراکز
+
+ تمامی مراکز {{ group.name }}
+
+ {{ university.viewValue }}
+
+
+
+
+
+
مقطع
diff --git a/src/routes/panel/dashboard/app/app.component.ts b/src/routes/panel/dashboard/app/app.component.ts
index 700a01d..1c1755d 100644
--- a/src/routes/panel/dashboard/app/app.component.ts
+++ b/src/routes/panel/dashboard/app/app.component.ts
@@ -32,17 +32,20 @@ export class AppComponent implements OnInit {
entry = ["مهر"]
majors = []
majorList = []
+ namespace = []
+ uid = ""
univeristygroups: UniversityGroup[] = [
{
name: 'مرکزی',
- value: "markazi",
+ value: "fani.markazi",
universities: [
- { value: 'athar', viewValue: 'اطهر' },
- { value: 'amirkabir', viewValue: 'امیر کبیر' },
- { value: 'khomein', viewValue: 'دکتر حسابی خمین' },
- { value: 'saveh', viewValue: 'مرکز پسران ساوه' }
+ { value: 'fani.markazi.arak.athar', viewValue: 'اطهر' },
+
+ { value: 'fani.markazi.arak.amirkabir', viewValue: 'امیر کبیر' },
+ { value: 'fani.markazi.khomein.pkhomein', viewValue: 'دکتر حسابی خمین' },
+ { value: 'fani.markazi.saveh.psaveh', viewValue: 'مرکز پسران ساوه' }
]
}
@@ -59,6 +62,7 @@ export class AppComponent implements OnInit {
constructor(private dialog: MatDialog, private rayconnect: Rayconnect, private snackbar: MatSnackBar) { }
ngOnInit(): void {
+ this.uid = this.rayconnect.user.uid
this.fetch();
Chart.defaults.global.defaultFontFamily = "Font"
@@ -86,7 +90,7 @@ export class AppComponent implements OnInit {
console.log(res['data'])
- if(this.majors.length == 0){
+ if (this.majors.length == 0) {
this.majorList = res['data']['majors']
}
let cachedMajorColor = this.RandomColor(res['data']['majors'].length, 'majors');