wme

src/app/dashboard/absorpation-plan/absorpation-list/absorpation-list.component.ts

@@ -59,9 +59,11 @@ export class AbsorpationListComponent implements OnInit {
 
     
     
+   
     this.route.params.subscribe(
       (params: Params) => {
-        this.pageId = params['absorpationListId'];
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
       }
     );
     

src/app/dashboard/achievements/achievement-list/achievement.component.ts

@@ -57,7 +57,9 @@ export class AchievementComponent implements OnInit {
     
     this.route.params.subscribe(
       (params: Params) => {
-        this.pageId = params['achievementPageId'];
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', '11');
+
         this.achievementsServie.getAchievementsList(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
           (responce) => {
             console.log(responce);

src/app/dashboard/advertisiment/advertisiment.component.ts

@@ -53,6 +53,14 @@ export class AdvertisimentComponent implements OnInit {
       this.authSer.internalHeader = false;
       //to show / hide permissions
 
+
+      this.route.params.subscribe(
+        (parmas: Params) => {
+          this.pageId = parmas['listPageId'];
+          localStorage.setItem('pageIdActive', '24');
+        }
+      );
+      
       this.route.parent.params.subscribe(
         (params:Params) => {
           this.userLoginId = params['userID'];
@@ -87,12 +95,6 @@ export class AdvertisimentComponent implements OnInit {
 
 
 
-      this.route.params.subscribe(
-        (parmas: Params) => {
-          this.pageId = parmas['adverId'];
-        }
-      );
-
 
       this.dashboardSer.getListData(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
         (responce) => {

src/app/dashboard/advertising-services/advertising-services-list/advertising-services-list.component.ts

@@ -54,6 +54,13 @@ export class AdvertisingServicesListComponent implements OnInit {
         this.authSer.internalHeader = false;
         //to show / hide permissions
 
+        this.route.params.subscribe(
+          (parmas: Params) => {
+            this.pageId = parmas['listPageId'];
+            localStorage.setItem('pageIdActive', parmas['listPageId']);
+          }
+        );
+        
         this.route.parent.params.subscribe(
           (params:Params) => {
             this.userLoginId = params['userID'];
@@ -86,11 +93,7 @@ export class AdvertisingServicesListComponent implements OnInit {
           }
         );
 
-        this.route.params.subscribe(
-          (parmas: Params) => {
-            this.pageId = parmas['advertisingListIds'];
-          }
-        );
+       
 
         this.dashboardSer.getListData(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
           (responce) => {

src/app/dashboard/bar-events/bar-events-list/bar-events-list.component.ts

@@ -54,6 +54,13 @@ export class BarEventsListComponent implements OnInit {
       this.authSer.internalHeader = false;
       //to show / hide permissions
 
+      this.route.params.subscribe(
+        (parmas: Params) => {
+          this.pageId = parmas['listPageId'];
+          localStorage.setItem('pageIdActive', parmas['listPageId']);
+        }
+      );
+
       this.route.parent.params.subscribe(
         (params:Params) => {
           this.userLoginId = params['userID'];
@@ -86,11 +93,7 @@ export class BarEventsListComponent implements OnInit {
         }
       );
 
-      this.route.params.subscribe(
-        (parmas: Params) => {
-          this.pageId = parmas['barEventId'];
-        }
-      );
+      
 
       this.dashboardSer.getListData(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
         (responce) => {

src/app/dashboard/contact-us/contact-us-list/contact-us-list.component.ts

@@ -53,6 +53,14 @@ export class ContactUsListComponent implements OnInit {
       this.authSer.internalHeader = false;
       //to show / hide permissions
 
+      this.route.params.subscribe(
+        (parmas: Params) => {
+          this.pageId = parmas['listPageId'];
+          localStorage.setItem('pageIdActive', parmas['listPageId']);
+        }
+      );
+
+
       this.route.parent.params.subscribe(
         (params:Params) => {
           this.userLoginId = params['userID'];
@@ -79,12 +87,7 @@ export class ContactUsListComponent implements OnInit {
         }
       );
 
-      this.route.params.subscribe(
-        (parmas: Params) => {
-          this.pageId = parmas['contactUsId'];
-        }
-      );
-
+     
       this.dashboardSer.getListData(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
         (responce) => {
           console.log(responce);

src/app/dashboard/dashboard-routing.ts

@@ -86,10 +86,10 @@ import { VehicleMovementReportComponent } from './vehicle-movement-report/vehicl
 
 const dashboardRouting: Routes = [
     {path: 'service/:userID/:serviceID', component: ServiceItemComponent, canActivate: [AuthGuard], children: [
-    {path: 'users/:userPageId', component: UsersComponent, canActivate: [AuthGuard]},
-    {path: 'roles/:rolesPageId', component: RolesListComponent, canActivate: [AuthGuard]},
-    {path: 'departments/:departsPageId', component: DepartmentListComponent, canActivate: [AuthGuard]},
-    {path: 'sections/:sectionPageId', component: SectionListComponent, canActivate: [AuthGuard]},
+    {path: 'users/:listPageId', component: UsersComponent, canActivate: [AuthGuard]},
+    {path: 'roles/:listPageId', component: RolesListComponent, canActivate: [AuthGuard]},
+    {path: 'departments/:listPageId', component: DepartmentListComponent, canActivate: [AuthGuard]},
+    {path: 'sections/:listPageId', component: SectionListComponent, canActivate: [AuthGuard]},
     {path: 'reports', component: ReportsPageComponent, canActivate: [AuthGuard]},
     {path: 'addu/:type_add', component: FormUserComponent, canActivate: [AuthGuard]},
     {path: 'addJoinUs', component: AddJoinUsComponent, canActivate:[AuthGuard]},
@@ -102,37 +102,37 @@ const dashboardRouting: Routes = [
     {path: 'editAdminstration/:typeAdminMode/:editAdminId', component: AddDepartmentComponent, canActivate: [AuthGuard]},
     {path: 'addSection', component: AddSectionComponent, canActivate: [AuthGuard]},
     {path: 'editSection/:typeSectionMode/:editSectionId', component: AddSectionComponent, canActivate: [AuthGuard]},
-    {path: 'hospitalsList/:typePageId', component: HospitalListComponent, canActivate: [AuthGuard]},
-    {path: 'mangementList/:typePageId', component: HospitalListComponent, canActivate: [AuthGuard]},
+    {path: 'hospitalsList/:listPageId', component: HospitalListComponent, canActivate: [AuthGuard]},
+    {path: 'mangementList/:listPageId', component: HospitalListComponent, canActivate: [AuthGuard]},
     {path: 'add/:typeAdd' , component: AddHospitalComponent, canActivate: [AuthGuard]},
     {path: 'Hospital/:typeHospitalMode/:editTypePageId', component: AddHospitalComponent, canActivate: [AuthGuard]},
     {path: 'Management/:typeHospitalMode/:editTypePageId', component: AddHospitalComponent, canActivate: [AuthGuard]},
-    {path: 'eventsList/:eventPageId', component: EventsComponent, canActivate: [AuthGuard]},
+    {path: 'eventsList/:listPageId', component: EventsComponent, canActivate: [AuthGuard]},
     {path: 'addEvent', component: AddEventComponent, canActivate: [AuthGuard]},
     {path: 'Event/:typeEventMode/:editEventId', component: AddEventComponent, canActivate:[AuthGuard]},
-    {path: 'externalsList/:externalPageId', component: ExternalListComponent, canActivate: [AuthGuard]},
+    {path: 'externalsList/:listPageId', component: ExternalListComponent, canActivate: [AuthGuard]},
     {path: 'addExternal', component: AddExternalComponent, canActivate: [AuthGuard]},
     {path: 'externalService/:typeExternalMode/:editExternalId', component: AddExternalComponent, canActivate: [AuthGuard]},
-    {path: 'achievementsList/:achievementPageId', component: AchievementComponent, canActivate: [AuthGuard]},
+    {path: 'achievementsList/:listPageId', component: AchievementComponent, canActivate: [AuthGuard]},
     {path: 'addAchievement', component: AddAchievementComponent, canActivate: [AuthGuard]},
     {path: 'achievement/:typeAchieventMode/:editAchievementId', component: AddAchievementComponent, canActivate: [AuthGuard]},
     {path: 'joinUs/:userPageId', component: UsersComponent, canActivate: [AuthGuard]},
-    {path: 'tabs/:tabPageId', component: TabListComponent, canActivate: [AuthGuard]},
+    {path: 'tabs/:listPageId', component: TabListComponent, canActivate: [AuthGuard]},
     {path: 'addTab', component: AddTabComponent, canActivate: [AuthGuard]},
     {path: 'tab/:typeTabMode/:editTabId', component: AddTabComponent, canActivate: [AuthGuard]},
-    {path: 'newsList/:newsPageId', component: NewsListComponent, canActivate: [AuthGuard]},
+    {path: 'newsList/:listPageId', component: NewsListComponent, canActivate: [AuthGuard]},
     {path: 'addNews', component: AddNewsComponent, canActivate: [AuthGuard]},
     {path: 'new/:typeNewMode/:editNewId', component: AddNewsComponent, canActivate: [AuthGuard]},
-    {path: 'footerList/:footerPageId', component: FooterListComponent, canActivate: [AuthGuard]},
+    {path: 'footerList/:listPageId', component: FooterListComponent, canActivate: [AuthGuard]},
     {path: 'addFooter', component: AddFooterComponent, canActivate: [AuthGuard]},
     {path: 'footer/:typeFooterMode/:editFooterId', component: AddFooterComponent, canActivate: [AuthGuard]},
-    {path: 'internalServicesList/:internalPageId', component: InternalServicesComponent, canActivate: [AuthGuard]},
+    {path: 'internalServicesList/:listPageId', component: InternalServicesComponent, canActivate: [AuthGuard]},
     {path: 'addInternalServices', component: AddInternalServicesComponent, canActivate: [AuthGuard]},
     {path: 'InternalServices/:typeInternalMode/:editInternalId', component: AddInternalServicesComponent, canActivate: [AuthGuard]},
-    {path: 'lecturesList/:lecturePageId', component: LecturesListComponent, canActivate:[AuthGuard]},
+    {path: 'lecturesList/:listPageId', component: LecturesListComponent, canActivate:[AuthGuard]},
     {path: 'addLecture', component: AddLectureComponent, canActivate: [AuthGuard]},
     {path: 'Lecture/:typeLectureMode/:editLectureId', component: AddLectureComponent, canActivate: [AuthGuard]},
-    {path: 'mainMenuList/:menuPageId', component: MainListComponent, canActivate:[AuthGuard]},
+    {path: 'mainMenuList/:listPageId', component: MainListComponent, canActivate:[AuthGuard]},
     {path: 'addMenu', component: AddMenuComponent, canActivate: [AuthGuard]},
     {path: 'menu/:typeMenuMode/:editMenuId', component: AddMenuComponent, canActivate: [AuthGuard]},
     {path: 'userPermission/:userPermissionId', component: UserPermissionComponent, canActivate: [AuthGuard]},
@@ -142,58 +142,58 @@ const dashboardRouting: Routes = [
     {path: 'reportList/:reportName', component: ReportListComponent , canActivate: [AuthGuard]},
     {path: 'advertisimentList/:adverId', component: AdvertisimentComponent , canActivate: [AuthGuard]},
     {path: 'advertisiment/:typeAdver', component: AddAdverComponent , canActivate: [AuthGuard]},
-    {path: 'barEventsList/:barEventId', component: BarEventsListComponent , canActivate: [AuthGuard]},
+    {path: 'barEventsList/:listPageId', component: BarEventsListComponent , canActivate: [AuthGuard]},
     {path: 'barEvent/:typeEventBar', component: AddBarEventComponent , canActivate: [AuthGuard]},
-    {path: 'contactUsList/:contactUsId', component: ContactUsListComponent , canActivate: [AuthGuard]},
+    {path: 'contactUsList/:listPageId', component: ContactUsListComponent , canActivate: [AuthGuard]},
     {path: 'contactUs/:typeContactUs/:contactId', component: AddContactUsComponent , canActivate: [AuthGuard]},
-    {path: 'visitingTimesList/:visitingTimesId', component: VisitingTimesListComponent , canActivate: [AuthGuard]},
+    {path: 'visitingTimesList/:listPageId', component: VisitingTimesListComponent , canActivate: [AuthGuard]},
     {path: 'visitingTime/:typeVisitingTime/:visitingTimeId', component: AddVisitingTimeComponent , canActivate: [AuthGuard]},
-    {path: 'eventCalendarsList/:eventCalendarsId', component: EventCalendarsListComponent , canActivate: [AuthGuard]},
+    {path: 'eventCalendarsList/:listPageId', component: EventCalendarsListComponent , canActivate: [AuthGuard]},
     {path: 'addEventCalendar', component: AddEventCalendarComponent, canActivate: [AuthGuard] },
     {path: 'eventCalendar/:typeEventCalendar/:eventCalendarId', component: AddEventCalendarComponent , canActivate: [AuthGuard]},
-    {path: 'externalAchievementsList/:externalAchievementsListIds', component: ExternalAchievementsListComponent , canActivate: [AuthGuard]},
+    {path: 'externalAchievementsList/:listPageId', component: ExternalAchievementsListComponent , canActivate: [AuthGuard]},
     {path: 'addExternalAchievement', component: AddExternalAchievementComponent, canActivate: [AuthGuard] },
     {path: 'externalAchievement/:typeExternalAchievement/:externalAchievementId', component: AddExternalAchievementComponent , canActivate: [AuthGuard]},
-    {path: 'statisticsList/:statisticsListIds', component: StatisticsListComponent , canActivate: [AuthGuard]},
+    {path: 'statisticsList/:listPageId', component: StatisticsListComponent , canActivate: [AuthGuard]},
     {path: 'addStatistic', component: AddStatisticComponent, canActivate: [AuthGuard] },
     {path: 'statistic/:typeStatistic/:statisticId', component: AddStatisticComponent , canActivate: [AuthGuard]},
-    {path: 'advertisingList/:advertisingListIds', component: AdvertisingServicesListComponent , canActivate: [AuthGuard]},
+    {path: 'advertisingList/:listPageId', component: AdvertisingServicesListComponent , canActivate: [AuthGuard]},
     {path: 'addAdvertising', component: AddAdvertisingServiceComponent, canActivate: [AuthGuard] },
     {path: 'advertising/:typeAdvertising/:advertisingId', component: AddAdvertisingServiceComponent , canActivate: [AuthGuard]},
-    {path: 'map/:mapId', component: MapComponent, canActivate: [AuthGuard]},
-    {path: 'supervisorList/:superVisorId', component: SupervisorListComponent},
+    {path: 'map/:listPageId', component: MapComponent, canActivate: [AuthGuard]},
+    {path: 'supervisorList/:listPageId', component: SupervisorListComponent},
     {path: 'superVisor/Add', component: SupervisorAddComponent},
     {path: 'superVisor/edit/:superEditId', component: SupervisorAddComponent},
-    {path: 'absorpationList/:absorpationListId', component: AbsorpationListComponent},
+    {path: 'absorpationList/:listPageId', component: AbsorpationListComponent},
     {path: 'absorpation/Add', component: AbsorpationAddComponent},
     {path: 'absorpation/edit/:absorpationEditId', component: AbsorpationAddComponent},
-    {path: 'trainnerList/:trainnerListId', component: TrainnerDataListComponent},
+    {path: 'trainnerList/:listPageId', component: TrainnerDataListComponent},
     {path: 'trainer/add', component: TrainnerDataAddComponent},
     {path: 'trainer/edit/:trainnerEditId', component: TrainnerDataAddComponent},
-    {path: 'reviewTrainerData/:reviewTrainerId', component: ReviewTraineeDataListComponent},
+    {path: 'reviewTrainerData/:listPageId', component: ReviewTraineeDataListComponent},
     {path: 'reviewTraineeData/add', component: ReviewTraineeAddComponent},
     {path: 'reviewTraineeData/edit/:reviewTraineeId', component: ReviewTraineeAddComponent},
     {path: 'reviewSectionForTrainee/:reviewSectionId', component: SectionReviewTraineeListComponent},
     {path: 'reviewSectionForTrainee/edit/:reviewSectionAddId', component: SectionReviewTraineeAddComponent},
     {path: 'registrationTraineeList/:registrationListId', component: RegistrationTraineeMovementListComponent},
     {path: 'registrationTraineeList/edit/:registrationTraineereviewSectionAddId', component: RegistrationTraineeMovementAddComponent},
-    {path: 'printCardTraineeList/:printTraineeId', component: PrintCardTraineeListComponent},
+    {path: 'printCardTraineeList/:listPageId', component: PrintCardTraineeListComponent},
     {path: 'printCardTrainee/edit/:printCardAddId', component: PrintCardTraineeAddComponent},
-    {path: 'finalAccerditationList/:finalAccerditationId', component: FinalAccerditationListComponent},
+    {path: 'finalAccerditationList/:listPageId', component: FinalAccerditationListComponent},
     {path: 'finalAccerditationList/edit/:finalAccerditationEdit', component: FinalAccerditationAddComponent},
-    {path: 'vehicleList/:vehicleListId', component: VehicleListComponent},
+    {path: 'vehicleList/:listPageId', component: VehicleListComponent},
     {path: 'vehicle/add', component: VehicleAddComponent},
     {path: 'vehicle/edit/:vehicleEditId', component: VehicleAddComponent},
-    {path: 'vehicleModelList/:modelVehicleListId' , component: ModelVehicleListComponent},
+    {path: 'vehicleModelList/:listPageId' , component: ModelVehicleListComponent},
     {path: 'vehicleModel/add' , component: ModelVehicleAddComponent},
     {path: 'vehicleModel/edit/:modelVehicleEditId', component:ModelVehicleAddComponent },
-    {path: 'registrationVehicleList/:registrationVehicleListId', component: RegistrationVehicleListComponent},
+    {path: 'registrationVehicleList/:listPageId', component: RegistrationVehicleListComponent},
     {path: 'registrationVehicle/add', component: RegistrationVehicleAddComponent},
     {path: 'registrationVehicle/edit/:registrationVehicleEditId', component:RegistrationVehicleAddComponent },
-    {path: 'registerMovementVehicleList/:registerMovementVehicleListId', component: RegisterMovementVehicleListComponent},
+    {path: 'registerMovementVehicleList/:listPageId', component: RegisterMovementVehicleListComponent},
     {path: 'registerMovementVehicle/add', component: RegisterMovementVehicleAddComponent},
     {path: 'registerMovementVehicle/edit/:registerMovementVehicleEditId', component: RegisterMovementVehicleAddComponent },
-    {path: 'vehicleMaintenanceList/:vehicleMaintenanceListId', component: VehicleMaintenanceListComponent},
+    {path: 'vehicleMaintenanceList/:listPageId', component: VehicleMaintenanceListComponent},
     {path: 'vehicleMaintenance/add', component: VehicleMaintenanceAddComponent},
     {path: 'vehicleMaintenance/edit/:vehicleMaintenanceEditId', component: VehicleMaintenanceAddComponent },
     {path: 'existingReportVehicle', component: ExistingReportComponent},

src/app/dashboard/department/department-list/department-list.component.ts

@@ -54,8 +54,8 @@ export class DepartmentListComponent implements OnInit {
         
     this.route.params.subscribe(
       (params:Params) => {
-        console.log(params['departsPageId']);
-        this.pageId = params['departsPageId'];
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', '3');
       },
       (error) => {console.log(error)}
     );

src/app/dashboard/event-calendars/event-calendars-list/event-calendars-list.component.ts

@@ -54,6 +54,13 @@ export class EventCalendarsListComponent implements OnInit {
       this.authSer.internalHeader = false;
       //to show / hide permissions
 
+      this.route.params.subscribe(
+        (parmas: Params) => {
+          this.pageId = parmas['listPageId'];
+          localStorage.setItem('pageIdActive', parmas['listPageId']);
+        }
+      );
+
       this.route.parent.params.subscribe(
         (params:Params) => {
           this.userLoginId = params['userID'];
@@ -86,11 +93,7 @@ export class EventCalendarsListComponent implements OnInit {
         }
       );
 
-      this.route.params.subscribe(
-        (parmas: Params) => {
-          this.pageId = parmas['eventCalendarsId'];
-        }
-      );
+   
 
       this.dashboardSer.getListData(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
         (responce) => {

src/app/dashboard/events/events.component.ts

@@ -57,7 +57,8 @@ export class EventsComponent implements OnInit {
     
     this.route.params.subscribe(
       (params: Params) => {
-        this.pageId = params['eventPageId'];
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', '8');
       }
     );
 

src/app/dashboard/external-achievements/external-achievements-list/external-achievements-list.component.ts

@@ -54,6 +54,13 @@ export class ExternalAchievementsListComponent implements OnInit {
       this.authSer.internalHeader = false;
       //to show / hide permissions
 
+      this.route.params.subscribe(
+        (parmas: Params) => {
+          this.pageId = parmas['listPageId'];
+          localStorage.setItem('pageIdActive', parmas['listPageId']);
+        }
+      );
+
       this.route.parent.params.subscribe(
         (params:Params) => {
           this.userLoginId = params['userID'];
@@ -86,11 +93,7 @@ export class ExternalAchievementsListComponent implements OnInit {
         }
       );
 
-      this.route.params.subscribe(
-        (parmas: Params) => {
-          this.pageId = parmas['externalAchievementsListIds'];
-        }
-      );
+    
 
       this.dashboardSer.getListData(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
         (responce) => {

src/app/dashboard/external-services/external-list/external-list.component.ts

@@ -58,7 +58,8 @@ export class ExternalListComponent implements OnInit {
     
     this.route.params.subscribe(
       (params: Params) => {
-        this.externalId = params['externalPageId'];
+        this.externalId = params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
       }
     );
     

src/app/dashboard/final-accreditation-of-trainees/final-accerditation-list/final-accerditation-list.component.ts

@@ -62,6 +62,14 @@ export class FinalAccerditationListComponent implements OnInit {
       this.authSer.showHeaderDashBoard = true;
       this.authSer.showDashboardHeader = true;
       this.authSer.internalHeader = false;
+
+      //init the values of permision boolean
+    this.route.params.subscribe(
+      (params: Params) => {
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
+      }
+    );
       
       this.route.parent.params.subscribe(
         (params:Params) => {

src/app/dashboard/footer/footer-list/footer-list.component.ts

@@ -63,7 +63,8 @@ export class FooterListComponent implements OnInit {
     
     this.route.params.subscribe(
       (params: Params) => {
-        this.footerId = params['footerPageId'];
+        this.footerId = params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
       }
     );
     
@@ -74,7 +75,7 @@ export class FooterListComponent implements OnInit {
         this.userLoginId = params['userID'];
         this.serviceId = params['serviceID'];
         if(this.serviceId == 6) {
-          this.serviceName = 'خدمه إداره المحتوي';
+          this.serviceName = 'خدمه إداره الصفحه الدخليه';
         } else if(this.serviceId == 2) {
           this.serviceName = 'خدمه إداره الصفحه الخارجيه';
         }

src/app/dashboard/hospitals/hospital-list/hospital-list.component.ts

@@ -61,7 +61,10 @@ export class HospitalListComponent implements OnInit {
     this.route.params.subscribe(
       (params: Params) => {
         //console.log('iddddddddd', params['hospitalListId']);
-        this.pageId = params['typePageId'];
+        this.pageId = params['listPageId'];
+
+        localStorage.setItem('pageIdActive', params['listPageId']);
+
         if(this.pageId == 6) {
           this.typeLink = 'المستشفيات والمراكز';
           this.typeServices = 'خدمه إداره المحتوي';

src/app/dashboard/internal-services/internal-services.component.ts

@@ -58,7 +58,8 @@ export class InternalServicesComponent implements OnInit {
     this.route.params.subscribe(
       (params: Params) => {
         //console.log('iddddddddd', params['hospitalListId']);
-        this.pageId = params['internalPageId'];
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', '14');
           this.typeLink = 'الخدمات الداخليه';
       }
     );

src/app/dashboard/lectures/lectures-list/lectures-list.component.ts

@@ -58,7 +58,8 @@ export class LecturesListComponent implements OnInit {
     
     this.route.params.subscribe(
       (params: Params) => {
-        this.pageId = params['lecturePageId'];
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', '15');
       }
     );
 

src/app/dashboard/main-menu/main-list/main-list.component.ts

@@ -61,7 +61,9 @@ export class MainListComponent implements OnInit {
     
     this.route.params.subscribe(
       (params: Params) => {
-        this.menuId = params['menuPageId'];
+        this.menuId = params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
+
       }
     );
     
@@ -73,7 +75,7 @@ export class MainListComponent implements OnInit {
         this.serviceId = params['serviceID'];
 
         if(this.serviceId == 6) {
-          this.servicesName = 'خدمه إداره المحتوي';
+          this.servicesName = 'خدمه إداره الصفحه الداخليه';
         } else if(this.serviceId == 2){
           this.servicesName = 'خدمه إداره الصفحه الخارجيه';
         }

src/app/dashboard/map/map.component.ts

@@ -1,3 +1,4 @@
+import { ActivatedRoute, Params } from '@angular/router';
 import { AuthServiceService } from './../../shared/auth-service.service';
 import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
@@ -16,6 +17,8 @@ export class MapComponent implements OnInit {
   constructor(private http: HttpClient, 
     private spinner: NgxSpinnerService, 
     private toastr: ToastrService,
+    private route: ActivatedRoute,
+
     private authSer: AuthServiceService) { 
     this.spinner.show();
   }
@@ -25,7 +28,7 @@ export class MapComponent implements OnInit {
 
   zoom: number = 8;
 
-
+pageId: number;
 
   
   markers: marker[] = [
@@ -40,6 +43,15 @@ export class MapComponent implements OnInit {
 
   ngOnInit() {
     
+
+    this.route.params.subscribe(
+      (params: Params) => {
+        this.pageId = +params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
+      }
+    );
+
+
     this.http.get(this.authSer.pathApi + '/get_reach_map/1').subscribe(
       (responce) => {
         console.log(responce);

src/app/dashboard/model-vehicle/model-vehicle-list/model-vehicle-list.component.ts

@@ -58,8 +58,9 @@ export class ModelVehicleListComponent implements OnInit {
     this.authSer.internalHeader = false;
 
     this.route.params.subscribe(
-      (params : Params) => {
-        this.pageId = +params['modelVehicleListId'];
+      (params: Params) => {
+        this.pageId = +params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
       }
     );
 

src/app/dashboard/news/news-list/news-list.component.ts

@@ -68,7 +68,8 @@ export class NewsListComponent implements OnInit {
     
     this.route.params.subscribe(
       (params: Params) => {
-        this.pageId = params['newsPageId'];
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
       }
     );
     
@@ -81,7 +82,7 @@ export class NewsListComponent implements OnInit {
         if(this.serviceId == 2) {
           this.serviceName = 'خدمه إداره الصفحه الخارجيه';
         } else if(this.serviceId == 6) {
-          this.serviceName = 'خدمه إداره المحتوي';
+          this.serviceName = 'خدمه إداره الصفحه الداخليه';
         }
 
         this.userSer.getPagesPermetiotns(this.userLoginId, this.serviceId).subscribe(

src/app/dashboard/print-card-trainee/print-card-trainee-list/print-card-trainee-list.component.ts

@@ -47,7 +47,8 @@ export class PrintCardTraineeListComponent implements OnInit {
     //init the values of permision boolean
     this.route.params.subscribe(
       (params: Params) => {
-        this.pageId = params['printTraineeId'];
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
       }
     );
 

src/app/dashboard/register-movement-vehicle/register-movement-vehicle-list/register-movement-vehicle-list.component.ts

@@ -59,7 +59,8 @@ export class RegisterMovementVehicleListComponent implements OnInit {
     //init the values of permision boolean
     this.route.params.subscribe(
       (params: Params) => {
-        this.pageId = params['registerMovementVehicleListId'];
+        this.pageId = +params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
       }
     );
 

src/app/dashboard/registration-vehicle/registration-vehicle-list/registration-vehicle-list.component.ts

@@ -55,11 +55,13 @@ export class RegistrationVehicleListComponent implements OnInit {
       this.authSer.showDashboardHeader = true;
       this.authSer.internalHeader = false;
 
-      this.route.params.subscribe(
-        (params: Params) => {
-          this.pageId = +params['registrationVehicleListId'];  
-        }
-      );
+     //init the values of permision boolean
+    this.route.params.subscribe(
+      (params: Params) => {
+        this.pageId = +params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
+      }
+    );
 
       this.http.get(this.authSer.pathApi + '/get_vehicle_types_list').subscribe(
         (response) => {

src/app/dashboard/reivew-trainee-data/review-trainee-data-list/review-trainee-data-list.component.ts

@@ -68,7 +68,8 @@ export class ReviewTraineeDataListComponent implements OnInit {
     
     this.route.params.subscribe(
       (params: Params) => {
-        this.pageId = params['reviewTrainerId'];
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
       }
     );
     

src/app/dashboard/reports-existing-vehicles/existing-report/existing-report.component.ts

@@ -27,7 +27,8 @@ export class ExistingReportComponent implements OnInit {
 
   ngOnInit() {
     
-    
+    localStorage.setItem('pageIdActive', '48');
+
 
     //get vehicles types 
     this.http.get(this.authSer.pathApi + '/get_vehicle_types_list').subscribe(

src/app/dashboard/reports-page/reports-page.component.ts

@@ -35,7 +35,7 @@ export class ReportsPageComponent implements OnInit {
     this.authSer.showHeaderDashBoard = true;
     this.authSer.showDashboardHeader = true;
     this.authSer.internalHeader = false;
-    
+    localStorage.setItem('pageIdActive', '5');
     this.route.parent.params.subscribe(
       (params: Params) => {
         this.reportService.userId = params['userID'];

src/app/dashboard/roles/roles-list/roles-list.component.ts

@@ -56,8 +56,8 @@ export class RolesListComponent implements OnInit {
 
     this.route.params.subscribe(
       (params: Params) => {
-        console.log(params['rolesPageId']);
-        this.pageId = params['rolesPageId'];
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', '2');
       }
     );
 

src/app/dashboard/sections/section-list/section-list.component.ts

@@ -50,7 +50,8 @@ export class SectionListComponent implements OnInit {
 
     this.route.params.subscribe(
       (params:Params) => {
-        this.pageId = params['sectionPageId'];
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', '4');
       }
     );
 
@@ -75,6 +76,13 @@ export class SectionListComponent implements OnInit {
           (responce) => {
             console.log(responce);
             this.pages = responce['pages'];
+            
+            for(let i = 0; i < this.pages.length; i++) {
+              if(this.pages[i].id == this.pageId) {
+                this.pages[i].active = 1;
+              }
+            }
+
             for(let i = 0; i< this.pages.length; i++) {
               if(this.pages[i].name == 'الأقسام') {
                 for(let j = 0; j < this.pages[i].permissions.length; j++) {

src/app/dashboard/service-item/service-item.component.ts

@@ -23,6 +23,8 @@ export class ServiceItemComponent implements OnInit {
   extraPages = [];
   defaultPageId: number;
   myInnerHeight = window.innerHeight;
+  pageId: number;
+  pageActiveId: number;
 
   isHovering = false;
 
@@ -30,6 +32,7 @@ export class ServiceItemComponent implements OnInit {
       this.isHovering = true;
       console.log(this.isHovering);
   }
+
   mouseLeaving() {
       this.isHovering = false;
       console.log(this.isHovering);
@@ -56,6 +59,7 @@ export class ServiceItemComponent implements OnInit {
     this.authSer.arabicTemplate = true;
     //hide search header
     this.authService.showSearchHeader = false;
+    
 
     //this.userSer.getServicesData();
     this.route.params.subscribe(
@@ -65,6 +69,10 @@ export class ServiceItemComponent implements OnInit {
       }
     );
 
+   
+
+    
+
     this.userSer.getServicesData(this.userId).subscribe(
       (responce) => {
         console.log(responce);
@@ -89,8 +97,17 @@ export class ServiceItemComponent implements OnInit {
         } else {
           this.authSer.showMoreLinks = false;
           this.pages = responce['pages'];
-          // this.pages[0].active = 1;
         }
+
+        //get page id from local storage
+        this.pageActiveId =  +localStorage.getItem('pageIdActive');
+        for(let i = 0; i < this.pages.length; i++) {
+          if(this.pages[i].id == this.pageActiveId) {
+            this.pages[i].active = 1;
+            console.log('hhhhhhhhhhhhhhhhhhhhhhhhhh', this.pages[i].id);
+          }
+        }
+
         this.spinner.hide();
         console.log('extraaaaa' , this.extraPages);
         console.log('paggges' , this.pages);
@@ -112,17 +129,22 @@ export class ServiceItemComponent implements OnInit {
           this.pages = responce['pages'];
           this.authSer.showMoreLinks = false;
           console.log(this.pages);
-          //this.pages[0].active = 1;
+          this.pages[0].active = 1;
           if(this.pages[0].id == 1) {
             console.log('/service/' + this.userId + '/' + service.id + '/users/' + this.pages[0].id);
+            //this.pages[0].active = 1;
             this.router.navigate(['/service/' + this.userId + '/' + service.id + '/users/' + this.pages[0].id]);
           }else if(this.pages[0].id == 2) {
+            //this.pages[0].active = 1;
             this.router.navigate(['/service/' + this.userId + '/' + service.id + '/roles/' + this.pages[0].id]);
           } else if(this.pages[0].id == 3) {
+            //this.pages[0].active = 1;
             this.router.navigate(['/service/' + this.userId + '/' + service.id + '/departments/' + this.pages[0].id]);
           } else if(this.pages[0].id == 4) {
+            //this.pages[0].active = 1;
             this.router.navigate(['/service/' + this.userId + '/' + service.id + '/sections/' + this.pages[0].id]);
           } else if(this.pages[0].id == 5) {
+            //this.pages[0].active = 1;
             this.router.navigate(['/service/' + this.userId + '/' + service.id + '/reports/' + this.pages[0].id]);
           }
           this.spinner.hide();
@@ -150,7 +172,7 @@ export class ServiceItemComponent implements OnInit {
             this.authSer.showMoreLinks = false;
           }
           console.log(this.pages);
-          //this.pages[0].active = 1;
+          this.pages[0].active = 1;
           if(this.pages[0].id == 6) {
             console.log('/service/' + this.userId + '/' + service.id + '/hospitalsList/' + this.pages[0].id);
             this.router.navigate(['/service/' + this.userId + '/' + service.id + '/hospitalsList/' + this.pages[0].id]);
@@ -161,8 +183,8 @@ export class ServiceItemComponent implements OnInit {
             console.log('/service/' + this.userId + '/' + service.id + '/eventsList/' + this.pages[0].id);
             this.router.navigate(['/service/' + this.userId + '/' + service.id + '/eventsList/' + this.pages[0].id]);
           } else if(this.pages[0].id == 9) {
-            console.log('/service/' + this.userId + '/' + service.id + '/joinUs/' + this.pages[0].id);
-            this.router.navigate(['/service/' + this.userId + '/' + service.id + '/joinUs/' + this.pages[0].id]);
+            console.log('/service/' + this.userId + '/' + service.id + '/users/' + this.pages[0].id);
+            this.router.navigate(['/service/' + this.userId + '/' + service.id + '/users/' + this.pages[0].id]);
           } else if(this.pages[0].id == 7 || this.pages[0].id == 19) {
             console.log('/service/' + this.userId + '/' + service.id + '/externalsList/' + this.pages[0].id);
             this.router.navigate(['/service/' + this.userId + '/' + service.id + '/externalsList/' + this.pages[0].id]);
@@ -218,6 +240,7 @@ export class ServiceItemComponent implements OnInit {
       );
     } else if(service.id == 3) {
       //خدمه التدريب
+      this.extraPages = [];
       this.userservice.getPagesPermetiotns(this.userId, service.id).subscribe(
         (responce) => {
 
@@ -235,7 +258,8 @@ export class ServiceItemComponent implements OnInit {
             this.authSer.showMoreLinks = false;
           }
           console.log(this.pages);
-          
+          this.pages[0].active = 1;
+  
           if(this.pages[0].id == 33) {
             this.router.navigate(['/service/' + this.userId + '/' + service.id + '/supervisorList/' + this.pages[0].id]);
           } else if(this.pages[0].id == 34) {
@@ -260,7 +284,7 @@ export class ServiceItemComponent implements OnInit {
       );
     } else if(service.id == 4) {
       //خدمه الحركه
-       
+      this.extraPages = [];
 
       this.userservice.getPagesPermetiotns(this.userId, service.id).subscribe(
         (responce) => {
@@ -279,6 +303,8 @@ export class ServiceItemComponent implements OnInit {
             this.authSer.showMoreLinks = false;
           }
           console.log(this.pages);
+          this.pages[0].active = 1;
+
           if(this.pages[0].id == 43) {
             this.router.navigate(['/service/' + this.userId + '/' + service.id + '/vehicleList/' + this.pages[0].id]);
           } else if(this.pages[0].id == 44) {
@@ -335,7 +361,7 @@ export class ServiceItemComponent implements OnInit {
     } else if(dataPage.id == 8) {
       this.router.navigate(['eventsList/' + dataPage.id], {relativeTo: this.route});
     } else if(dataPage.id == 9){
-      this.router.navigate(['joinUs/' + dataPage.id], {relativeTo: this.route});
+      this.router.navigate(['users/' + dataPage.id], {relativeTo: this.route});
     } else if(dataPage.id == 7 || dataPage.id == 19) {
       this.router.navigate(['externalsList/' + dataPage.id], {relativeTo: this.route});
     } else if(dataPage.id == 11) {

src/app/dashboard/statistics/statistics-list/statistics-list.component.ts

@@ -54,6 +54,13 @@ export class StatisticsListComponent implements OnInit {
       this.authSer.internalHeader = false;
       //to show / hide permissions
 
+      this.route.params.subscribe(
+        (parmas: Params) => {
+          this.pageId = parmas['listPageId'];
+          localStorage.setItem('pageIdActive', parmas['listPageId']);
+        }
+      );
+
       this.route.parent.params.subscribe(
         (params:Params) => {
           this.userLoginId = params['userID'];
@@ -86,11 +93,7 @@ export class StatisticsListComponent implements OnInit {
         }
       );
 
-      this.route.params.subscribe(
-        (parmas: Params) => {
-          this.pageId = parmas['statisticsListIds'];
-        }
-      );
+     
 
       this.dashboardSer.getListData(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
         (responce) => {

src/app/dashboard/supervisor/supervisor-list/supervisor-list.component.ts

@@ -61,7 +61,8 @@ export class SupervisorListComponent implements OnInit {
     
     this.route.params.subscribe(
       (params: Params) => {
-        this.superVisorId = params['superVisorId'];
+        this.superVisorId = +params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
       }
     );
     

src/app/dashboard/tabs/tab-list/tab-list.component.ts

@@ -55,7 +55,8 @@ export class TabListComponent implements OnInit {
 
     this.route.params.subscribe(
       (params: Params) => {
-        this.pageId = params['tabPageId'];
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', '12');
       }
     );
         //to show / hide permissions

src/app/dashboard/trainner-data/trainner-data-list/trainner-data-list.component.ts

@@ -55,6 +55,13 @@ export class TrainnerDataListComponent implements OnInit {
     this.authSer.internalHeader = false;
     //to show / hide permissions
 
+    this.route.params.subscribe(
+      (params: Params) => {
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
+      }
+    );
+
     this.route.parent.params.subscribe(
       (params:Params) => {
           this.userId = params['userID'];
@@ -84,9 +91,6 @@ export class TrainnerDataListComponent implements OnInit {
       );
 
     //get id in edit mode 
-    this.route.params.subscribe(
-      (params: Params) => {
-        this.pageId = params['trainnerListId'];
         this.dashBoardService.getListData(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
           (responce) => {
             console.log(responce);
@@ -99,8 +103,6 @@ export class TrainnerDataListComponent implements OnInit {
             console.log(error);
           }
         );
-      }
-    );
 
   }
 

src/app/dashboard/users/users.component.ts

@@ -47,6 +47,7 @@ export class UsersComponent implements OnInit {
 
 
   ngOnInit() {
+
     //show spinner
     this.spinner.show();
 
@@ -66,8 +67,8 @@ export class UsersComponent implements OnInit {
     //catch id of page
     this.route.params.subscribe(
       (params: Params) => {
-        this.pageId = params['userPageId'];
-        console.log(this.pageId);
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
         if(this.pageId == 1) {
           this.typeLink = 'المستخدمين';
           this.typeService = 'خدمه الصلاحيات';
@@ -87,10 +88,13 @@ export class UsersComponent implements OnInit {
         this.userLoginId = params['userID']; //user login id
         this.serviceId = params['serviceID']; //service id
         if(this.pageId == 1) {
+
+
         //get pages with its permisions
         this.userSer.getPagesPermetiotns(this.userLoginId, this.serviceId).subscribe(
           (responce)=>{
-            this.pages = responce['pages'];            
+            this.pages = responce['pages']; 
+
             for(let i = 0; i< this.pages.length; i++) {
                 if(this.pages[i].id == 1) {
                   for(let j = 0; j < this.pages[i].permissions.length; j++) {

src/app/dashboard/vehicle-maintenance/vehicle-maintenance-list/vehicle-maintenance-list.component.ts

@@ -62,7 +62,8 @@ export class VehicleMaintenanceListComponent implements OnInit {
     //init the values of permision boolean
     this.route.params.subscribe(
       (params: Params) => {
-        this.pageId = params['vehicleMaintenanceListId'];
+        this.pageId = +params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
       }
     );
 

src/app/dashboard/vehicle-movement-report/vehicle-movement-report/vehicle-movement-report.component.ts

@@ -30,8 +30,11 @@ export class VehicleMovementReportComponent implements OnInit {
 
     if(this.typeReport == 'Movement') {
       this.typeReportPage = 'تقارير حركه المركبات';
+      localStorage.setItem('pageIdActive', '49');
     } else if(this.typeReport == 'General') {
       this.typeReportPage = 'تقرير عام عن المركبه';
+      localStorage.setItem('pageIdActive', '50');
+
     } else {
       console.log('error');
     }

src/app/dashboard/vehicle/vehicle-list/vehicle-list.component.ts

@@ -58,9 +58,11 @@ export class VehicleListComponent implements OnInit {
     this.authSer.showDashboardHeader = true;
     this.authSer.internalHeader = false;
 
+      //init the values of permision boolean
     this.route.params.subscribe(
       (params: Params) => {
-        this.pageId = +params['vehicleListId'];   
+        this.pageId = +params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
       }
     );
 

src/app/dashboard/visiting-times/visiting-times-list/visiting-times-list.component.ts

@@ -53,6 +53,13 @@ export class VisitingTimesListComponent implements OnInit {
       this.authSer.internalHeader = false;
       //to show / hide permissions
 
+      this.route.params.subscribe(
+        (parmas: Params) => {
+          this.pageId = parmas['listPageId'];
+          localStorage.setItem('pageIdActive', parmas['listPageId']);
+        }
+      );
+
       this.route.parent.params.subscribe(
         (params:Params) => {
           this.userLoginId = params['userID'];
@@ -85,12 +92,7 @@ export class VisitingTimesListComponent implements OnInit {
         }
       );
 
-      this.route.params.subscribe(
-        (parmas: Params) => {
-          this.pageId = parmas['visitingTimesId'];
-        }
-      );
-
+   
       this.dashboardSer.getListData(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
         (responce) => {
           console.log(responce);

src/app/login/login.component.ts

@@ -29,6 +29,9 @@ export class LoginComponent implements OnInit {
   
 
   ngOnInit() {
+    if(!this.authSer.isAuthenticated()) {
+      this.router.navigate(['ExternalPage']);
+    }
     // this.authSer.showSearchHeader = false;
     this.authSer.notificationLogin = false;
     // this.authSer.showHeaderLogin = true;
@@ -36,6 +39,7 @@ export class LoginComponent implements OnInit {
     this.authSer.showDashboardHeader = true;
     this.authSer.arabicTemplate = true;
     this.spinner.hide();
+    
   }
 
   //login function from services

src/app/servicesItems/services.component.ts

@@ -110,8 +110,8 @@ getDataService(dataService){
             console.log('/service/' + this.idUser + '/' + dataService.id + '/eventsList/' + this.pages[0].id);
             this.router.navigate(['/service/' + this.idUser + '/' + dataService.id + '/eventsList/' + this.pages[0].id]);
           } else if(this.pages[0].id == 9) {
-            console.log('/service/' + this.idUser + '/' + dataService.id + '/joinUs/' + this.pages[0].id);
-            this.router.navigate(['/service/' + this.idUser + '/' + dataService.id + '/joinUs/' + this.pages[0].id]);
+            console.log('/service/' + this.idUser + '/' + dataService.id + '/users/' + this.pages[0].id);
+            this.router.navigate(['/service/' + this.idUser + '/' + dataService.id + '/users/' + this.pages[0].id]);
           } else if(this.pages[0].id == 7 || this.pages[0] == 19) {
             console.log('/service/' + this.idUser + '/' + dataService.id + '/externalsList/' + this.pages[0].id);
             this.router.navigate(['/service/' + this.idUser + '/' + dataService.id + '/externalsList/' + this.pages[0].id]);

src/app/shared/auth-guard.service.ts

@@ -1,6 +1,7 @@
 import { AuthServiceService } from './auth-service.service';
 import { Injectable } from '@angular/core';
 import { Router, CanActivate } from '@angular/router';
+import { Location } from '@angular/common';
 
 @Injectable({
   providedIn: 'root'
@@ -8,7 +9,10 @@ import { Router, CanActivate } from '@angular/router';
 
 export class AuthGuardService {
 
-  constructor(public auth: AuthServiceService, public router: Router) {}
+  constructor(public auth: AuthServiceService,
+     private location: Location,
+      public router: Router) {}
+
   canActivate(): boolean {
     if (this.auth.isAuthenticated()) {
       this.router.navigate(['/login']);